Undo my 2007-02-07 change, switching back to the c-strcase module

introduced in the 2007-02-03 change.  Bruno Haible reported that
the 2007-02-07 change would be dangerous in Turkish if we add a
language whose name contains "i", since "i" is not lowercase "I"
in Turkish.
* bootstrap.conf (gnulib_modules): Add c-strcase.  Remove strcase.
* lib/.cvsignore: Add c-ctype.c, c-ctype.h, c-strcase.h,
c-strcasecomp.c, c-strncasecmp.c.  Remove strcasecmp.c, strncasecmp.c.
* m4/.cvsignore: Remove strcase.m4.
* src/getargs.c: Revert 2007-02-07 change, as follows.
Include c-strcase.h.
(language_argmatch): Use c_strcasecmp rather than strcasecmp.

diff --git a/ChangeLog b/ChangeLog
index 852cc8d1f7bdd782f9f5f2893b1c5e2dcdf2aa6e..dde006f1cd3875c2c5321792b2eb870495ab69c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2007-02-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Undo my 2007-02-07 change, switching back to the c-strcase module
+       introduced in the 2007-02-03 change.  Bruno Haible reported that
+       the 2007-02-07 change would be dangerous in Turkish if we add a
+       language whose name contains "i", since "i" is not lowercase "I"
+       in Turkish.
+       * bootstrap.conf (gnulib_modules): Add c-strcase.  Remove strcase.
+       * lib/.cvsignore: Add c-ctype.c, c-ctype.h, c-strcase.h,
+       c-strcasecomp.c, c-strncasecmp.c.  Remove strcasecmp.c, strncasecmp.c.
+       * m4/.cvsignore: Remove strcase.m4.
+       * src/getargs.c: Revert 2007-02-07 change, as follows.
+       Include c-strcase.h.
+       (language_argmatch): Use c_strcasecmp rather than strcasecmp.
+
 2007-02-11  Bruno Haible  <bruno@clisp.org>
 
        Enable the Java related testsuite tests when the only Java compiler

diff --git a/bootstrap.conf b/bootstrap.conf
index 9904426d35312e1167f2dd508f4c21817ffab145..1a0df2e2d3ce0f9db1d3e8de666ffa0da96c4d7b 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -20,9 +20,10 @@
 
 # gnulib modules used by this package.
 gnulib_modules='
-       argmatch config-h configmake dirname error extensions fopen-safer
+       argmatch config-h c-strcase configmake
+       dirname error extensions fopen-safer
        getopt gettext hash inttypes javacomp-script javaexec-script malloc
-       mbswidth obstack quote quotearg stdbool stpcpy strcase strerror strtoul
+       mbswidth obstack quote quotearg stdbool stpcpy strerror strtoul
        strverscmp unistd unistd-safer unlocked-io verify xalloc xalloc-die
        xstrndup
 '

diff --git a/lib/.cvsignore b/lib/.cvsignore
index fa006b5e77993fd4f68eaf89a69995b35a4a93e2..c2c86105d9ca57260e512b9f3972420d68b3b70a 100644 (file)
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -4,6 +4,11 @@ Makefile.in
 argmatch.c
 argmatch.h
 basename.c
+c-ctype.c
+c-ctype.h
+c-strcase.h
+c-strcasecmp.c
+c-strncasecmp.c
 config.h
 config.hin
 configmake.h
@@ -46,12 +51,10 @@ stdint_.h
 stdio--.h
 stdio-safer.h
 stpcpy.c
-strcasecmp.c
 strerror.c
 string.h
 string_.h
 stripslash.c
-strncasecmp.c
 strndup.c
 strnlen.c
 strtol.c

diff --git a/m4/.cvsignore b/m4/.cvsignore
index 68a249c52eb3c1b4dd1d7ac89dfc3076e52ef71c..ba11f3e6cc7f1a2e4bd0fd4b43de24e730b3bb82 100644 (file)
--- a/m4/.cvsignore
+++ b/m4/.cvsignore
@@ -38,7 +38,6 @@ stdint.m4
 stdint_h.m4
 stdio-safer.m4
 stpcpy.m4
-strcase.m4
 strerror.m4
 string_h.m4
 strndup.m4

diff --git a/src/getargs.c b/src/getargs.c
index 0938c6980b732ddae3e11dc6c4eed853d1544235..4ff38fb188594e2ce0373bf6f5dd98c89fe5ccbe 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -25,6 +25,7 @@
 #include "revision.h"
 
 #include <argmatch.h>
+#include <c-strcase.h>
 #include <configmake.h>
 #include <error.h>
 
@@ -366,7 +367,7 @@ language_argmatch (char const *arg, int prio, location const *loc)
     {
       int i;
       for (i = 0; valid_languages[i].language[0]; i++)
-       if (strcasecmp (arg, valid_languages[i].language) == 0)
+       if (c_strcasecmp (arg, valid_languages[i].language) == 0)
          {
            language_prio = prio;
            language = &valid_languages[i];