Undo most of the 2007-02-03 change, switching to the strcase module

now that gnulib strcase has been fixed.
* bootstrap.conf (gnulib_modules): Remove c-strcase.  Add strcase.
* lib/.cvsignore: Remove c-ctype.c, c-ctype.h, c-strcase.h,
c-strcasecomp.c, c-strncasecmp.c.  Add strcasecmp.c, strncasecmp.c
* m4/.cvsignore: Add strcase.m4.
* src/getargs.c: Revert 2007-02-03 change, as follows.
Don't include c-strcase.h.
(language_argmatch): Use strcasecmp rather than c_strcasecmp.
strcasecmp has "unspecified behavior" outside the POSIX locale,
but it works fine in practice if at least one argument is ASCII,
as is the case in Bison.

diff --git a/ChangeLog b/ChangeLog
index 29fa8be4a4a15686fbaf933ca413824c0bf96847..1adcebcd601bb0dde1663e7b660c9166a2c05660 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2007-02-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Undo most of the 2007-02-03 change, switching to the strcase module
+       now that gnulib strcase has been fixed.
+       * bootstrap.conf (gnulib_modules): Remove c-strcase.  Add strcase.
+       * lib/.cvsignore: Remove c-ctype.c, c-ctype.h, c-strcase.h,
+       c-strcasecomp.c, c-strncasecmp.c.  Add strcasecmp.c, strncasecmp.c
+       * m4/.cvsignore: Add strcase.m4.
+       * src/getargs.c: Revert 2007-02-03 change, as follows.
+       Don't include c-strcase.h.
+       (language_argmatch): Use strcasecmp rather than c_strcasecmp.
+       strcasecmp has "unspecified behavior" outside the POSIX locale,
+       but it works fine in practice if at least one argument is ASCII,
+       as is the case in Bison.
+
 2007-02-07  Paolo Bonzini  <bonzini@gnu.org>
 
        * tests/java.at: Skip tests if only one of javac/java is present.

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

diff --git a/lib/.cvsignore b/lib/.cvsignore
index c2c86105d9ca57260e512b9f3972420d68b3b70a..fa006b5e77993fd4f68eaf89a69995b35a4a93e2 100644 (file)
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -4,11 +4,6 @@ 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
@@ -51,10 +46,12 @@ 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 ba11f3e6cc7f1a2e4bd0fd4b43de24e730b3bb82..68a249c52eb3c1b4dd1d7ac89dfc3076e52ef71c 100644 (file)
--- a/m4/.cvsignore
+++ b/m4/.cvsignore
@@ -38,6 +38,7 @@ 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 4ff38fb188594e2ce0373bf6f5dd98c89fe5ccbe..0938c6980b732ddae3e11dc6c4eed853d1544235 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -25,7 +25,6 @@
 #include "revision.h"
 
 #include <argmatch.h>
-#include <c-strcase.h>
 #include <configmake.h>
 #include <error.h>
 
@@ -367,7 +366,7 @@ language_argmatch (char const *arg, int prio, location const *loc)
     {
       int i;
       for (i = 0; valid_languages[i].language[0]; i++)
-       if (c_strcasecmp (arg, valid_languages[i].language) == 0)
+       if (strcasecmp (arg, valid_languages[i].language) == 0)
          {
            language_prio = prio;
            language = &valid_languages[i];