Mercurial > hg > octave-shane > gnulib-hg

changeset 13303:522a26cf44a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wctob: Fix for weird platforms.
author Bruno Haible <bruno@clisp.org>
date Mon, 03 May 2010 10:07:34 +0200
parents 38bc4e23ff1e
children e5593199cd7e
files ChangeLog lib/wctob.c
diffstat 2 files changed, 12 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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 @@
 
   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;
 }