Changeset 3791

Timestamp:

Mar 22, 2012, 9:56:02 PM (13 years ago)

Author:

bird

Message:

trunk: Backported ctype.h fix r3789. Fixes #199.

Location:

trunk/libc

Files:

• include (modified) (1 prop)
• include/_ctype.h (modified) (2 diffs)
• src/libc/locale (modified) (1 prop)
• src/libc/locale/locale_ctype.c (modified) (1 diff)

trunk/libc/include/_ctype.h

@@ -166 +166 @@
 static __inline__ unsigned __ctype(__ct_rune_t __ch, unsigned __f)
 {
-    return __ch < 256 && __ch >= -128
+    return __ch < 256 && __ch >= -128 && __ch != -1 /*EOF*/
         ? __libc_GLocaleCtype.aufType[__ch & 0xff] & __f
         : 0;
@@ -178 +178 @@
 static __inline__ int __isctype(__ct_rune_t __ch, unsigned __f)
 {
-    return __ch <= 255 && __ch >= -128
+    return __ch <= 255 && __ch >= -128 && __ch != -1 /*EOF*/
         ? !!(__libc_GLocaleCtypeDefault.aufType[__ch & 0xff] & __f)
         : 0;

trunk/libc/src/libc/locale/locale_ctype.c

@@ -222 +222 @@
 unsigned __ctype(__ct_rune_t __ch, unsigned __f)
 {
-    return __ch <= 255 && __ch >= -128
+    return __ch <= 255 && __ch >= -128 && __ch != -1 /*EOF*/
         ? __libc_GLocaleCtype.aufType[__ch & 0xff] & __f
         : 0;