Replace the isw* functions on Linux libc5.

diff --git a/ChangeLog b/ChangeLog
index e8e952595d8eeccb6dcfa3c54f03f671ce0da1eb..21b435dcf1d1eeea0e87278bc379ef5582b8fd28 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2008-04-21  Bruno Haible  <bruno@clisp.org>
+
+       * lib/wctype.in.h (iswalnum, iswalpha, iswblank, iswcntrl, iswdigit,
+       iswgraph, iswlower, iswprint, iswpunct, iswspace, iswupper, iswxdigit):
+       Define to replacements if REPLACE_ISWCNTRL is 1.
+       * m4/wctype.m4 (gl_WCTYPE_H): Test whether the isw* functions work.
+       If not, set WCTYPE_H to nonempty and REPLACE_ISWCNTRL to 1.
+       * modules/wctype (Makefile.am): Substitute REPLACE_ISWCNTRL.
+       * doc/posix-functions/iswalnum.texi: Mention the 'wctype' module and
+       what it fixes.
+       * doc/posix-functions/iswalpha.texi: Likewise.
+       * doc/posix-functions/iswblank.texi: Likewise.
+       * doc/posix-functions/iswcntrl.texi: Likewise.
+       * doc/posix-functions/iswdigit.texi: Likewise.
+       * doc/posix-functions/iswgraph.texi: Likewise.
+       * doc/posix-functions/iswlower.texi: Likewise.
+       * doc/posix-functions/iswprint.texi: Likewise.
+       * doc/posix-functions/iswpunct.texi: Likewise.
+       * doc/posix-functions/iswspace.texi: Likewise.
+       * doc/posix-functions/iswupper.texi: Likewise.
+       * doc/posix-functions/iswxdigit.texi: Likewise.
+
 2008-04-21  Bruno Haible  <bruno@clisp.org>
 
        * m4/vsnprintf.m4 (gl_FUNC_VSNPRINTF): Fix typo in last commit.

diff --git a/doc/posix-functions/iswalnum.texi b/doc/posix-functions/iswalnum.texi
index 4eedee4dacd558d0c2dec900b506a3fff72995cb..ca0ceeaec808de4ec4ed68c0fb184dd78e8e377a 100644 (file)
--- a/doc/posix-functions/iswalnum.texi
+++ b/doc/posix-functions/iswalnum.texi
@@ -4,18 +4,21 @@
 
 POSIX specification: @url{http://www.opengroup.org/susv3xsh/iswalnum.html}
 
-Gnulib module: ---
+Gnulib module: wctype
 
 Portability problems fixed by Gnulib:
 @itemize
+@item
+This function is missing on some platforms:
+Solaris 2.5.1.
+@item
+This function returns 0 for all possible arguments on some platforms:
+Linux libc5.
 @end itemize
 
 Portability problems not fixed by Gnulib:
 @itemize
 @item
-This function is missing on some platforms:
-Solaris 2.5.1.
-@item
 On Windows platforms, @code{wchar_t} is a 16-bit type and therefore cannot
 accommodate all Unicode characters.
 @end itemize

diff --git a/doc/posix-functions/iswalpha.texi b/doc/posix-functions/iswalpha.texi
index 80bba7969d21d66437f5021f3ed14596d04d214c..6e491f922e47184bc1e71111f6add21081ea9190 100644 (file)
--- a/doc/posix-functions/iswalpha.texi
+++ b/doc/posix-functions/iswalpha.texi
@@ -4,18 +4,21 @@
 
 POSIX specification: @url{http://www.opengroup.org/susv3xsh/iswalpha.html}
 
-Gnulib module: ---
+Gnulib module: wctype
 
 Portability problems fixed by Gnulib:
 @itemize
+@item
+This function is missing on some platforms:
+Solaris 2.5.1.
+@item
+This function returns 0 for all possible arguments on some platforms:
+Linux libc5.
 @end itemize
 
 Portability problems not fixed by Gnulib:
 @itemize
 @item
-This function is missing on some platforms:
-Solaris 2.5.1.
-@item
 On Windows platforms, @code{wchar_t} is a 16-bit type and therefore cannot
 accommodate all Unicode characters.
 @end itemize

diff --git a/doc/posix-functions/iswblank.texi b/doc/posix-functions/iswblank.texi
index 9ea0d9145bde156095ce47d3d2210ae3116bc4bb..d229808ea6964464dc650733310d8320b4b2d5a4 100644 (file)
--- a/doc/posix-functions/iswblank.texi
+++ b/doc/posix-functions/iswblank.texi
@@ -4,10 +4,13 @@
 
 POSIX specification: @url{http://www.opengroup.org/susv3xsh/iswblank.html}
 
-Gnulib module: ---
+Gnulib module: wctype
 
 Portability problems fixed by Gnulib:
 @itemize
+@item
+This function returns 0 for all possible arguments on some platforms:
+Linux libc5.
 @end itemize
 
 Portability problems not fixed by Gnulib:

diff --git a/doc/posix-functions/iswcntrl.texi b/doc/posix-functions/iswcntrl.texi
index a9602c730adf1995ff04e7cfdd6ad5aedc639994..a60ced6f2bb1739e34fa6222ad012b35242f9e59 100644 (file)
--- a/doc/posix-functions/iswcntrl.texi
+++ b/doc/posix-functions/iswcntrl.texi
@@ -4,18 +4,21 @@
 
 POSIX specification: @url{http://www.opengroup.org/susv3xsh/iswcntrl.html}
 
-Gnulib module: ---
+Gnulib module: wctype
 
 Portability problems fixed by Gnulib:
 @itemize
+@item
+This function is missing on some platforms:
+Solaris 2.5.1.
+@item
+This function returns 0 for all possible arguments on some platforms:
+Linux libc5.
 @end itemize
 
 Portability problems not fixed by Gnulib:
 @itemize
 @item
-This function is missing on some platforms:
-Solaris 2.5.1.
-@item
 On Windows platforms, @code{wchar_t} is a 16-bit type and therefore cannot
 accommodate all Unicode characters.
 @end itemize

diff --git a/doc/posix-functions/iswdigit.texi b/doc/posix-functions/iswdigit.texi
index a73f05ce14e039013971d2dfc597de94c643bfae..8e747fcaee7b0c0d6a1e92720b996d228b028602 100644 (file)
--- a/doc/posix-functions/iswdigit.texi
+++ b/doc/posix-functions/iswdigit.texi
@@ -4,18 +4,21 @@
 
 POSIX specification: @url{http://www.opengroup.org/susv3xsh/iswdigit.html}
 
-Gnulib module: ---
+Gnulib module: wctype
 
 Portability problems fixed by Gnulib:
 @itemize
+@item
+This function is missing on some platforms:
+Solaris 2.5.1.
+@item
+This function returns 0 for all possible arguments on some platforms:
+Linux libc5.
 @end itemize
 
 Portability problems not fixed by Gnulib:
 @itemize
 @item
-This function is missing on some platforms:
-Solaris 2.5.1.
-@item
 On Windows platforms, @code{wchar_t} is a 16-bit type and therefore cannot
 accommodate all Unicode characters.
 @end itemize

diff --git a/doc/posix-functions/iswgraph.texi b/doc/posix-functions/iswgraph.texi
index 76b8459ab61c117d59973cb330b83c1cfcc2555f..42fd60a61e6eb1efe66a0aa8b7a64c9dea1fac77 100644 (file)
--- a/doc/posix-functions/iswgraph.texi
+++ b/doc/posix-functions/iswgraph.texi
@@ -4,18 +4,21 @@
 
 POSIX specification: @url{http://www.opengroup.org/susv3xsh/iswgraph.html}
 
-Gnulib module: ---
+Gnulib module: wctype
 
 Portability problems fixed by Gnulib:
 @itemize
+@item
+This function is missing on some platforms:
+Solaris 2.5.1.
+@item
+This function returns 0 for all possible arguments on some platforms:
+Linux libc5.
 @end itemize
 
 Portability problems not fixed by Gnulib:
 @itemize
 @item
-This function is missing on some platforms:
-Solaris 2.5.1.
-@item
 On Windows platforms, @code{wchar_t} is a 16-bit type and therefore cannot
 accommodate all Unicode characters.
 @end itemize

diff --git a/doc/posix-functions/iswlower.texi b/doc/posix-functions/iswlower.texi
index 9f89a9b1a9203850e1340e00d172796b220e7df5..8c8c7940ab15b383bf8adde4823dcc1aed45763c 100644 (file)
--- a/doc/posix-functions/iswlower.texi
+++ b/doc/posix-functions/iswlower.texi
@@ -4,18 +4,21 @@
 
 POSIX specification: @url{http://www.opengroup.org/susv3xsh/iswlower.html}
 
-Gnulib module: ---
+Gnulib module: wctype
 
 Portability problems fixed by Gnulib:
 @itemize
+@item
+This function is missing on some platforms:
+Solaris 2.5.1.
+@item
+This function returns 0 for all possible arguments on some platforms:
+Linux libc5.
 @end itemize
 
 Portability problems not fixed by Gnulib:
 @itemize
 @item
-This function is missing on some platforms:
-Solaris 2.5.1.
-@item
 On Windows platforms, @code{wchar_t} is a 16-bit type and therefore cannot
 accommodate all Unicode characters.
 @end itemize

diff --git a/doc/posix-functions/iswprint.texi b/doc/posix-functions/iswprint.texi
index d2cef7e81b99ec8d45ac2e5f6bdb665a7f1da056..e8ba9003aea1a121979e70cefadd872a0f6ce799 100644 (file)
--- a/doc/posix-functions/iswprint.texi
+++ b/doc/posix-functions/iswprint.texi
@@ -4,18 +4,21 @@
 
 POSIX specification: @url{http://www.opengroup.org/susv3xsh/iswprint.html}
 
-Gnulib module: ---
+Gnulib module: wctype
 
 Portability problems fixed by Gnulib:
 @itemize
+@item
+This function is missing on some platforms:
+Solaris 2.5.1.
+@item
+This function returns 0 for all possible arguments on some platforms:
+Linux libc5.
 @end itemize
 
 Portability problems not fixed by Gnulib:
 @itemize
 @item
-This function is missing on some platforms:
-Solaris 2.5.1.
-@item
 On Windows platforms, @code{wchar_t} is a 16-bit type and therefore cannot
 accommodate all Unicode characters.
 @end itemize

diff --git a/doc/posix-functions/iswpunct.texi b/doc/posix-functions/iswpunct.texi
index c79b9c1f6319a7fe363bd0ff8aa46e3f31f6353b..58b7e0769fdda3fa5f43a599e59ffa08c3065376 100644 (file)
--- a/doc/posix-functions/iswpunct.texi
+++ b/doc/posix-functions/iswpunct.texi
@@ -4,18 +4,21 @@
 
 POSIX specification: @url{http://www.opengroup.org/susv3xsh/iswpunct.html}
 
-Gnulib module: ---
+Gnulib module: wctype
 
 Portability problems fixed by Gnulib:
 @itemize
+@item
+This function is missing on some platforms:
+Solaris 2.5.1.
+@item
+This function returns 0 for all possible arguments on some platforms:
+Linux libc5.
 @end itemize
 
 Portability problems not fixed by Gnulib:
 @itemize
 @item
-This function is missing on some platforms:
-Solaris 2.5.1.
-@item
 On Windows platforms, @code{wchar_t} is a 16-bit type and therefore cannot
 accommodate all Unicode characters.
 @end itemize

diff --git a/doc/posix-functions/iswspace.texi b/doc/posix-functions/iswspace.texi
index 5a43254fc230c15e023a323f02c59b7bd5a34c07..671e14fff2d1d9b260be3b21efeb019c03c889f5 100644 (file)
--- a/doc/posix-functions/iswspace.texi
+++ b/doc/posix-functions/iswspace.texi
@@ -4,18 +4,21 @@
 
 POSIX specification: @url{http://www.opengroup.org/susv3xsh/iswspace.html}
 
-Gnulib module: ---
+Gnulib module: wctype
 
 Portability problems fixed by Gnulib:
 @itemize
+@item
+This function is missing on some platforms:
+Solaris 2.5.1.
+@item
+This function returns 0 for all possible arguments on some platforms:
+Linux libc5.
 @end itemize
 
 Portability problems not fixed by Gnulib:
 @itemize
 @item
-This function is missing on some platforms:
-Solaris 2.5.1.
-@item
 On Windows platforms, @code{wchar_t} is a 16-bit type and therefore cannot
 accommodate all Unicode characters.
 @end itemize

diff --git a/doc/posix-functions/iswupper.texi b/doc/posix-functions/iswupper.texi
index dbe04c2992edba361a2dadf473940a7a25d7f236..3d5fae9aaf670385f5323a852695ac6bf763d3a0 100644 (file)
--- a/doc/posix-functions/iswupper.texi
+++ b/doc/posix-functions/iswupper.texi
@@ -4,18 +4,21 @@
 
 POSIX specification: @url{http://www.opengroup.org/susv3xsh/iswupper.html}
 
-Gnulib module: ---
+Gnulib module: wctype
 
 Portability problems fixed by Gnulib:
 @itemize
+@item
+This function is missing on some platforms:
+Solaris 2.5.1.
+@item
+This function returns 0 for all possible arguments on some platforms:
+Linux libc5.
 @end itemize
 
 Portability problems not fixed by Gnulib:
 @itemize
 @item
-This function is missing on some platforms:
-Solaris 2.5.1.
-@item
 On Windows platforms, @code{wchar_t} is a 16-bit type and therefore cannot
 accommodate all Unicode characters.
 @end itemize

diff --git a/doc/posix-functions/iswxdigit.texi b/doc/posix-functions/iswxdigit.texi
index fe1837beaeb6d6d179b4cc8d46f7c8892d4a0535..c7dab23fa6addcb94fbb903e6900ed9eeb8065cd 100644 (file)
--- a/doc/posix-functions/iswxdigit.texi
+++ b/doc/posix-functions/iswxdigit.texi
@@ -4,18 +4,21 @@
 
 POSIX specification: @url{http://www.opengroup.org/susv3xsh/iswxdigit.html}
 
-Gnulib module: ---
+Gnulib module: wctype
 
 Portability problems fixed by Gnulib:
 @itemize
+@item
+This function is missing on some platforms:
+Solaris 2.5.1.
+@item
+This function returns 0 for all possible arguments on some platforms:
+Linux libc5.
 @end itemize
 
 Portability problems not fixed by Gnulib:
 @itemize
 @item
-This function is missing on some platforms:
-Solaris 2.5.1.
-@item
 On Windows platforms, @code{wchar_t} is a 16-bit type and therefore cannot
 accommodate all Unicode characters.
 @end itemize

diff --git a/lib/wctype.in.h b/lib/wctype.in.h
index 73ce09f4507ac153385dcfb80ca6f53b176466b8..feb66565d19e1fe47006594feaf3c775f4f8e8ad 100644 (file)
--- a/lib/wctype.in.h
+++ b/lib/wctype.in.h
@@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <wctype.h>, for platforms that lack it.
 
-   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2006-2008 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -57,8 +57,9 @@ typedef int __wctype_wint_t;
 #endif
 
 /* FreeBSD 4.4 to 4.11 has <wctype.h> but lacks the functions.
+   Linux libc5 has <wctype.h> and the functions but they are broken.
    Assume all 12 functions are implemented the same way, or not at all.  */
-#if ! @HAVE_ISWCNTRL@
+#if ! @HAVE_ISWCNTRL@ || @REPLACE_ISWCNTRL@
 
 /* IRIX 5.3 has macros but no functions, its isw* macros refer to an
    undefined variable _ctmp_ and to <ctype.h> macros like _P, and they
@@ -78,6 +79,22 @@ typedef int __wctype_wint_t;
 #  undef iswupper
 #  undef iswxdigit
 
+/* Linux libc5 has <wctype.h> and the functions but they are broken.  */
+#  if @REPLACE_ISWCNTRL@
+#   define iswalnum rpl_iswalnum
+#   define iswalpha rpl_iswalpha
+#   define iswblank rpl_iswblank
+#   define iswcntrl rpl_iswcntrl
+#   define iswdigit rpl_iswdigit
+#   define iswgraph rpl_iswgraph
+#   define iswlower rpl_iswlower
+#   define iswprint rpl_iswprint
+#   define iswpunct rpl_iswpunct
+#   define iswspace rpl_iswspace
+#   define iswupper rpl_iswupper
+#   define iswxdigit rpl_iswxdigit
+#  endif
+
 static inline int
 iswalnum (__wctype_wint_t wc)
 {

diff --git a/m4/wctype.m4 b/m4/wctype.m4
index 7483c4feaf521d8618d7da883e32b45f9a806729..7c6718c3e14e38fde512e3ce67d02b06aa39255f 100644 (file)
--- a/m4/wctype.m4
+++ b/m4/wctype.m4
@@ -1,6 +1,6 @@
 dnl A placeholder for ISO C99 <wctype.h>, for platforms that lack it.
 
-dnl Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -9,6 +9,7 @@ dnl Written by Paul Eggert.
 
 AC_DEFUN([gl_WCTYPE_H],
 [
+  AC_REQUIRE([AC_PROG_CC])
   AC_CHECK_FUNCS_ONCE([iswcntrl])
   if test $ac_cv_func_iswcntrl = yes; then
     HAVE_ISWCNTRL=1
@@ -30,7 +31,28 @@ AC_DEFUN([gl_WCTYPE_H],
   WCTYPE_H=wctype.h
   if test $ac_cv_header_wctype_h = yes; then
     if test $ac_cv_func_iswcntrl = yes; then
-      WCTYPE_H=
+      dnl Linux libc5 has an iswprint function that returns 0 for all arguments.
+      dnl The other functions are likely broken in the same way.
+      AC_CACHE_CHECK([whether iswcntrl works], [gl_cv_func_iswcntrl_works],
+        [
+          AC_TRY_RUN([#include <stddef.h>
+                      #include <stdio.h>
+                      #include <time.h>
+                      #include <wchar.h>
+                      #include <wctype.h>
+                      int main () { return iswprint ('x') == 0; }],
+            [gl_cv_func_iswcntrl_works=yes], [gl_cv_func_iswcntrl_works=no])
+        ],
+        [
+          AC_TRY_COMPILE([#include <stdlib.h>
+                          #if __GNU_LIBRARY__ == 1
+                          Linux libc5 i18n is broken.
+                          #endif],
+            [gl_cv_func_iswcntrl_works=yes], [gl_cv_func_iswcntrl_works=no])
+        ])
+      if test $gl_cv_func_iswcntrl_works = yes; then
+        WCTYPE_H=
+      fi
     fi
     dnl Compute NEXT_WCTYPE_H even if WCTYPE_H is empty,
     dnl for the benefit of builds from non-distclean directories.
@@ -41,4 +63,11 @@ AC_DEFUN([gl_WCTYPE_H],
   fi
   AC_SUBST([HAVE_WCTYPE_H])
   AC_SUBST([WCTYPE_H])
+
+  if test "$gl_cv_func_iswcntrl_works" = no; then
+    REPLACE_ISWCNTRL=1
+  else
+    REPLACE_ISWCNTRL=0
+  fi
+  AC_SUBST([REPLACE_ISWCNTRL])
 ])

diff --git a/modules/wctype b/modules/wctype
index 156235c6ba77a74cb52540776fca8727f4875cfd..b8ee21abb8fee547f870c6753a8fb4ca8c85ffef 100644 (file)
--- a/modules/wctype
+++ b/modules/wctype
@@ -25,6 +25,7 @@ wctype.h: wctype.in.h
              -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
              -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
              -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
+             -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \
              < $(srcdir)/wctype.in.h; \
        } > $@-t
        mv $@-t $@