wctype: Provide iswblank function.

diff --git a/ChangeLog b/ChangeLog
index 3b8e0cdf1c08c05c888c2441fa9d284ccbe16cee..0e54678f02a8450f8096289eb005239d59f5a5f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-19  Bruno Haible  <bruno@clisp.org>
+
+       wctype: Provide iswblank function.
+       * lib/wctype.in.h (iswblank): Provide a replacement also when iswcntrl
+       exists and is fine.
+       * m4/wctype_h.m4 (gl_WCTYPE_H): Also check whether iswcntrl exists.
+       * modules/wctype (Makefile.am): Substitute HAVE_ISWBLANK.
+       * tests/test-wctype.c (main): Re-enable the iswblank tests.
+       * doc/posix-functions/iswblank.texi: Update.
+
 2010-03-19  Bruno Haible  <bruno@clisp.org>
 
        Tests of module 'pty' in C++ mode.

diff --git a/doc/posix-functions/iswblank.texi b/doc/posix-functions/iswblank.texi
index e8ea1bea547ae364fd7a44ff4714e6c1ccb83877..7aa4bd57aa624d74f7330e2fa88a11c7b345e81c 100644 (file)
--- a/doc/posix-functions/iswblank.texi
+++ b/doc/posix-functions/iswblank.texi
@@ -9,6 +9,9 @@ Gnulib module: wctype
 Portability problems fixed by Gnulib:
 @itemize
 @item
+This function is missing on some platforms:
+AIX 4.3.2, IRIX 6.5, OSF/1 5.1, Solaris 9, mingw.
+@item
 This function returns 0 for all possible arguments on some platforms:
 Linux libc5.
 @end itemize
@@ -16,9 +19,6 @@ Linux libc5.
 Portability problems not fixed by Gnulib:
 @itemize
 @item
-This function is missing on some platforms:
-AIX 4.3.2, IRIX 6.5, OSF/1 5.1, Solaris 9, mingw.
-@item
 On AIX and 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 06930142465e861589ee960777c2fd441e8c352f..8016203060c2c7b24ae97eb24422663f65c3cbc9 100644 (file)
--- a/lib/wctype.in.h
+++ b/lib/wctype.in.h
@@ -69,7 +69,8 @@
 
 /* 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.  */
+   Assume all 11 functions (all isw* except iswblank) are implemented the
+   same way, or not at all.  */
 #if ! @HAVE_ISWCNTRL@ || @REPLACE_ISWCNTRL@
 
 /* IRIX 5.3 has macros but no functions, its isw* macros refer to an
@@ -271,7 +272,16 @@ towupper
   return (wc >= 'a' && wc <= 'z' ? wc - 'a' + 'A' : wc);
 }
 
-#endif /* ! HAVE_ISWCNTRL || REPLACE_ISWCNTRL */
+#elif ! @HAVE_ISWBLANK@
+/* Only the iswblank function is missing.  */
+
+static inline int
+iswblank (wint_t wc)
+{
+  return wc == ' ' || wc == '\t';
+}
+
+#endif
 
 #if defined __MINGW32__
 

diff --git a/m4/wctype_h.m4 b/m4/wctype_h.m4
index 83daffc9c71110a7d2fe77cd6d40f69999676a4a..329245147797273006eea0c3207487d7c249a854 100644 (file)
--- a/m4/wctype_h.m4
+++ b/m4/wctype_h.m4
@@ -1,4 +1,4 @@
-# wctype_h.m4 serial 5
+# wctype_h.m4 serial 6
 
 dnl A placeholder for ISO C99 <wctype.h>, for platforms that lack it.
 
@@ -20,6 +20,13 @@ AC_DEFUN([gl_WCTYPE_H],
     HAVE_ISWCNTRL=0
   fi
   AC_SUBST([HAVE_ISWCNTRL])
+  AC_CHECK_FUNCS_ONCE([iswblank])
+  if test $ac_cv_func_iswblank = yes; then
+    HAVE_ISWBLANK=1
+  else
+    HAVE_ISWBLANK=0
+  fi
+  AC_SUBST([HAVE_ISWBLANK])
   AC_CHECK_HEADERS_ONCE([wctype.h])
   AC_REQUIRE([AC_C_INLINE])
 

diff --git a/modules/wctype b/modules/wctype
index 4666b3c36fd7e33a8169c5e41997f3e64f9bfa55..b212e35cb93638c74dfe11de6df122546d12e9e5 100644 (file)
--- a/modules/wctype
+++ b/modules/wctype
@@ -26,6 +26,7 @@ wctype.h: wctype.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
+             -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \
              -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
              -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
              -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \

diff --git a/tests/test-wctype.c b/tests/test-wctype.c
index 49d7cfa0de591f9585e924f49d4dab34d6bde8e9..5db215e8fe73d87f1a27093236cf01d70d803b05 100644 (file)
--- a/tests/test-wctype.c
+++ b/tests/test-wctype.c
@@ -33,9 +33,7 @@ main (void)
   /* Check that the isw* functions exist as functions or as macros.  */
   (void) iswalnum (0);
   (void) iswalpha (0);
-#if 0 /* not portable: missing on mingw */
   (void) iswblank (0);
-#endif
   (void) iswcntrl (0);
   (void) iswdigit (0);
   (void) iswgraph (0);
@@ -49,9 +47,7 @@ main (void)
   /* Check that the isw* functions map WEOF to 0.  */
   ASSERT (!iswalnum (e));
   ASSERT (!iswalpha (e));
-#if 0 /* not portable: missing on mingw */
   ASSERT (!iswblank (e));
-#endif
   ASSERT (!iswcntrl (e));
   ASSERT (!iswdigit (e));
   ASSERT (!iswgraph (e));