wctob: Fix for weird platforms.

diff --git a/ChangeLog b/ChangeLog
index 2f7dd4547ce708bc8b4fce292d3f82cb4e0db2bd..797a38141585381fe20d1e4e2927b5a9f60b32c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-03  Bruno Haible  <bruno@clisp.org>
+
+       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  <meyering@redhat.com>
 
        maint.mk: remove obsolete comments

diff --git a/lib/wctob.c b/lib/wctob.c
index 1d1cc7b1c6e30d3379c79de5ef81ba404a3f01e5..8a66ec9c1bd991b80f45286ed6e701932990fdcb 100644 (file)
--- 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 <bruno@clisp.org>, 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;
 }