From 3a59228aa9e83e507b62eb5281817accccee72ba Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 3 May 2010 10:07:34 +0200 Subject: [PATCH] wctob: Fix for weird platforms. --- ChangeLog | 6 ++++++ lib/wctob.c | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f7dd4547..797a38141 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-05-03 Bruno Haible + + wctob: Fix for weird platforms. + * lib/wctob.c (wctob): When wint_t is larger than wchar_t, check the + argument value. + 2010-05-03 Jim Meyering maint.mk: remove obsolete comments diff --git a/lib/wctob.c b/lib/wctob.c index 1d1cc7b1c..8a66ec9c1 100644 --- a/lib/wctob.c +++ b/lib/wctob.c @@ -1,5 +1,5 @@ /* Convert wide character to unibyte character. - Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2008, 2010 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify @@ -30,8 +30,9 @@ wctob (wint_t wc) if (!(MB_CUR_MAX <= sizeof (buf))) abort (); - if (wctomb (buf, wc) == 1) - return (unsigned char) buf[0]; - else - return EOF; + /* Handle the case where WEOF is a value that does not fit in a wchar_t. */ + if (wc == (wchar_t)wc) + if (wctomb (buf, (wchar_t)wc) == 1) + return (unsigned char) buf[0]; + return EOF; } -- 2.11.0