# HG changeset patch # User Bruno Haible # Date 1272874054 -7200 # Node ID 522a26cf44a2a215d082395f6a6b8fadcd6ca65d # Parent 38bc4e23ff1ed0b513fed6aa93ef3bbd30aba4fe wctob: Fix for weird platforms. diff --git a/ChangeLog b/ChangeLog --- 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 --- 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 @@ 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; }