bison-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

reverting most of the c_strcasecmp change


From: Paul Eggert
Subject: reverting most of the c_strcasecmp change
Date: Wed, 07 Feb 2007 12:38:38 -0800
User-agent: Gnus/5.1008 (Gnus v5.10.8) Emacs/21.4 (gnu/linux)

I installed the following now that gnulib supports strcasecmp better.

2007-02-07  Paul Eggert  <address@hidden>

        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.

Index: bootstrap.conf
===================================================================
RCS file: /cvsroot/bison/bison/bootstrap.conf,v
retrieving revision 1.7
diff -u -p -r1.7 bootstrap.conf
--- bootstrap.conf      4 Feb 2007 07:19:10 -0000       1.7
+++ bootstrap.conf      7 Feb 2007 20:37:25 -0000
@@ -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
 '
Index: lib/.cvsignore
===================================================================
RCS file: /cvsroot/bison/bison/lib/.cvsignore,v
retrieving revision 1.25
diff -u -p -r1.25 .cvsignore
--- lib/.cvsignore      4 Feb 2007 07:19:10 -0000       1.25
+++ lib/.cvsignore      7 Feb 2007 20:37:25 -0000
@@ -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
Index: m4/.cvsignore
===================================================================
RCS file: /cvsroot/bison/bison/m4/.cvsignore,v
retrieving revision 1.26
diff -u -p -r1.26 .cvsignore
--- m4/.cvsignore       29 Jan 2007 10:54:42 -0000      1.26
+++ m4/.cvsignore       7 Feb 2007 20:37:25 -0000
@@ -38,6 +38,7 @@ stdint.m4
 stdint_h.m4
 stdio-safer.m4
 stpcpy.m4
+strcase.m4
 strerror.m4
 string_h.m4
 strndup.m4
Index: src/getargs.c
===================================================================
RCS file: /cvsroot/bison/bison/src/getargs.c,v
retrieving revision 1.90
diff -u -p -r1.90 getargs.c
--- src/getargs.c       4 Feb 2007 07:19:10 -0000       1.90
+++ src/getargs.c       7 Feb 2007 20:37:25 -0000
@@ -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 
     {
       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];




reply via email to

[Prev in Thread] Current Thread [Next in Thread]