Simplify handling of strncasecmp. Improve link warning.

diff --git a/ChangeLog b/ChangeLog
index 68d8616b77510a123e95927a8219777d923e7b46..6f50e0e1c8deb4322d4a96bdead8ef2983513dca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-02-04  Bruno Haible  <bruno@clisp.org>
+
+       Simplify handling of strncasecmp.
+       * lib/string_.h (strncasecmp): Remove test for GNULIB_STRCASE. Change
+       the conditional link warning.
+       * m4/string_h.m4 (gl_STRING_MODULE_INDICATOR_DEFAULTS): Don't
+       initialize GNULIB_STRCASE.
+       * modules/strcase (configure.ac): Don't invoke
+       gl_STRING_MODULE_INDICATOR.
+       * modules/string (string.h): Don't substitute GNULIB_STRCASE.
+
 2007-02-04  Bruno Haible  <bruno@clisp.org>
 
        New module mbscasecmp, reduced goal of strcasecmp.

diff --git a/lib/string_.h b/lib/string_.h
index 59a14ca24b9198565bbde2a20c87dae99fcf4719..e1c0373e93b126acfed463fc875fde5c4dc9a1d5 100644 (file)
--- a/lib/string_.h
+++ b/lib/string_.h
@@ -133,15 +133,16 @@ extern int strcasecmp (char const *s1, char const *s2);
    returning less than, equal to or greater than zero if S1 is
    lexicographically less than, equal to or greater than S2.
    Note: This function cannot work correctly in multibyte locales.  */
-#if @GNULIB_STRCASE@
-# if ! @HAVE_DECL_STRNCASECMP@
-extern int strncasecmp (char const *__s1, char const *__s2, size_t __n);
-# endif
+#if ! @HAVE_DECL_STRNCASECMP@
+extern int strncasecmp (char const *s1, char const *s2, size_t n);
 #endif
 #if defined GNULIB_POSIXCHECK
+/* strncasecmp() does not work with multibyte strings:
+   POSIX says that it operates on "strings", and "string" in POSIX is defined
+   as a sequence of bytes, not of characters.  */
 # undef strncasecmp
 # define strncasecmp(a,b) \
-    (GL_LINK_WARNING ("strncasecmp cannot work correctly in multibyte locales - don't use it if you care about internationalization"), \
+    (GL_LINK_WARNING ("strncasecmp cannot work correctly on character strings in multibyte locales - don't use it if you care about internationalization; use c_strncasecmp (from gnulib module c-strcase) if you want a locale independent function"), \
      strncasecmp (a, b))
 #endif
 

diff --git a/m4/string_h.m4 b/m4/string_h.m4
index 8dfe95f0f8436cbf3668829313896fb98738d835..b68afc9a44aca14831851bda35dd883a77f637aa 100644 (file)
--- a/m4/string_h.m4
+++ b/m4/string_h.m4
@@ -59,7 +59,6 @@ AC_DEFUN([gl_STRING_MODULE_INDICATOR_DEFAULTS],
   GNULIB_MEMRCHR=0;     AC_SUBST([GNULIB_MEMRCHR])
   GNULIB_STPCPY=0;      AC_SUBST([GNULIB_STPCPY])
   GNULIB_STPNCPY=0;     AC_SUBST([GNULIB_STPNCPY])
-  GNULIB_STRCASE=0;     AC_SUBST([GNULIB_STRCASE])
   GNULIB_STRCHRNUL=0;   AC_SUBST([GNULIB_STRCHRNUL])
   GNULIB_STRDUP=0;      AC_SUBST([GNULIB_STRDUP])
   GNULIB_STRNDUP=0;     AC_SUBST([GNULIB_STRNDUP])

diff --git a/modules/strcase b/modules/strcase
index 77d2f2c7466148c1bdd989384573660241411531..05c1c921c3155a41070f7a1ea598658a09552d70 100644 (file)
--- a/modules/strcase
+++ b/modules/strcase
@@ -13,7 +13,6 @@ string
 
 configure.ac:
 gl_STRCASE
-gl_STRING_MODULE_INDICATOR([strcase])
 
 Makefile.am:
 

diff --git a/modules/string b/modules/string
index 8e657257f589b817efbfac0f835ed70c3c9a7c9c..a2eab98f3cfbd62ad9bd44128fbcaf97441ab3e7 100644 (file)
--- a/modules/string
+++ b/modules/string
@@ -30,7 +30,6 @@ string.h: string_.h
              -e 's|@''GNULIB_MEMRCHR''@|$(GNULIB_MEMRCHR)|g' \
              -e 's|@''GNULIB_STPCPY''@|$(GNULIB_STPCPY)|g' \
              -e 's|@''GNULIB_STPNCPY''@|$(GNULIB_STPNCPY)|g' \
-             -e 's|@''GNULIB_STRCASE''@|$(GNULIB_STRCASE)|g' \
              -e 's|@''GNULIB_STRCHRNUL''@|$(GNULIB_STRCHRNUL)|g' \
              -e 's|@''GNULIB_STRDUP''@|$(GNULIB_STRDUP)|g' \
              -e 's|@''GNULIB_STRNDUP''@|$(GNULIB_STRNDUP)|g' \