[Cvs-cvs] ccvs/lib ChangeLog fnmatch.c fnmatch_loop.c get...

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     06/07/07 02:46:50

Modified files:
        lib            : ChangeLog fnmatch.c fnmatch_loop.c getcwd.c 
                         getdate.c getdate.y getopt.c getpagesize.h 
                         glob.c regex_internal.h strftime.c 

Log message:
        * fnmatch.c, fnmatch_loop.c, getcwd.c, getdate.c, getdate.y, getopt.c,
        getpagesize.h, glob.c, regex_internal.h, strftime.c: Update from
        GNULIB.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/ChangeLog?cvsroot=cvs&r1=1.534&r2=1.535
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/fnmatch.c?cvsroot=cvs&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/fnmatch_loop.c?cvsroot=cvs&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/getcwd.c?cvsroot=cvs&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/getdate.c?cvsroot=cvs&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/getdate.y?cvsroot=cvs&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/getopt.c?cvsroot=cvs&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/getpagesize.h?cvsroot=cvs&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/glob.c?cvsroot=cvs&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/regex_internal.h?cvsroot=cvs&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/strftime.c?cvsroot=cvs&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/ChangeLog,v
retrieving revision 1.534
retrieving revision 1.535
diff -u -b -r1.534 -r1.535
--- ChangeLog   7 Jul 2006 00:48:20 -0000       1.534
+++ ChangeLog   7 Jul 2006 02:46:50 -0000       1.535
@@ -1,3 +1,9 @@
+2006-07-06  Derek Price  <address@hidden>
+
+       * fnmatch.c, fnmatch_loop.c, getcwd.c, getdate.c, getdate.y, getopt.c,
+       getpagesize.h, glob.c, regex_internal.h, strftime.c: Update from
+       GNULIB.
+
 2006-07-06  Jim Hyslop <address@hidden>
 
        * getaddrinfo.c: changed '#if WIN32_NATIVE' to '#ifdef' to allow it

Index: fnmatch.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/fnmatch.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- fnmatch.c   7 Jul 2006 00:12:48 -0000       1.15
+++ fnmatch.c   7 Jul 2006 02:46:50 -0000       1.16
@@ -86,15 +86,8 @@
 #if defined _LIBC || !defined __GNU_LIBRARY__ || !HAVE_FNMATCH_GNU
 
 
-# ifdef isblank
-#  define ISBLANK(c) isblank (c)
-# else
-#  define ISBLANK(c) ((c) == ' ' || (c) == '\t')
-# endif
-# ifdef isgraph
-#  define ISGRAPH(c) isgraph (c)
-# else
-#  define ISGRAPH(c) (isprint (c) && !isspace (c))
+# if ! (defined isblank || HAVE_DECL_ISBLANK)
+#  define isblank(c) ((c) == ' ' || (c) == '\t')
 # endif
 
 # define STREQ(s1, s2) ((strcmp (s1, s2) == 0))
@@ -152,14 +145,7 @@
 # endif
 
 /* Note that this evaluates C many times.  */
-# ifdef _LIBC
 #  define FOLD(c) ((flags & FNM_CASEFOLD) ? tolower (c) : (c))
-# else
-#  ifndef ISUPPER
-#   define ISUPPER(Ch) isupper(Ch)
-#  endif
-#  define FOLD(c) ((flags & FNM_CASEFOLD) && ISUPPER (c) ? tolower (c) : (c))
-# endif
 # define CHAR  char
 # define UCHAR unsigned char
 # define INT   int

Index: fnmatch_loop.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/fnmatch_loop.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- fnmatch_loop.c      6 Jul 2006 13:47:56 -0000       1.6
+++ fnmatch_loop.c      7 Jul 2006 02:46:50 -0000       1.7
@@ -290,10 +290,10 @@
 #else
                    if ((STREQ (str, L_("alnum")) && isalnum ((UCHAR) *n))
                        || (STREQ (str, L_("alpha")) && isalpha ((UCHAR) *n))
-                       || (STREQ (str, L_("blank")) && ISBLANK ((UCHAR) *n))
+                       || (STREQ (str, L_("blank")) && isblank ((UCHAR) *n))
                        || (STREQ (str, L_("cntrl")) && iscntrl ((UCHAR) *n))
                        || (STREQ (str, L_("digit")) && isdigit ((UCHAR) *n))
-                       || (STREQ (str, L_("graph")) && ISGRAPH ((UCHAR) *n))
+                       || (STREQ (str, L_("graph")) && isgraph ((UCHAR) *n))
                        || (STREQ (str, L_("lower")) && islower ((UCHAR) *n))
                        || (STREQ (str, L_("print")) && isprint ((UCHAR) *n))
                        || (STREQ (str, L_("punct")) && ispunct ((UCHAR) *n))

Index: getcwd.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getcwd.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- getcwd.c    6 Jul 2006 02:17:59 -0000       1.9
+++ getcwd.c    7 Jul 2006 02:46:50 -0000       1.10
@@ -38,23 +38,13 @@
 
 #if HAVE_DIRENT_H || _LIBC
 # include <dirent.h>
-# ifndef _D_EXACT_NAMLEN
-#  define _D_EXACT_NAMLEN(d) strlen ((d)->d_name)
-# endif
 #else
 # define dirent direct
-# if HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif
-# if HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif
-# if HAVE_NDIR_H
+# define _D_EXACT_NAMLEN(d) (d)->d_namlen
 #  include <ndir.h>
-# endif
 #endif
 #ifndef _D_EXACT_NAMLEN
-# define _D_EXACT_NAMLEN(d) ((d)->d_namlen)
+# define _D_EXACT_NAMLEN(d) strlen ((d)->d_name)
 #endif
 #ifndef _D_ALLOC_NAMLEN
 # define _D_ALLOC_NAMLEN(d) (_D_EXACT_NAMLEN (d) + 1)

Index: getdate.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getdate.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- getdate.c   6 Jul 2006 13:47:56 -0000       1.46
+++ getdate.c   7 Jul 2006 02:46:50 -0000       1.47
@@ -175,8 +175,8 @@
 
 
 /* ISDIGIT differs from isdigit, as follows:
-   - Its arg may be any int or unsigned int; it need not be an unsigned char.
-   - It's guaranteed to evaluate its argument exactly once.
+   - Its arg may be any int or unsigned int; it need not be an unsigned char
+     or EOF.
    - It's typically faster.
    POSIX says that only '0' through '9' are digits.  Prefer ISDIGIT to
    isdigit unless it's important to use the locale's definition
@@ -2485,7 +2485,6 @@
   for (p = word; *p; p++)
     {
       unsigned char ch = *p;
-      if (islower (ch))
        *p = toupper (ch);
     }
 

Index: getdate.y
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getdate.y,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- getdate.y   6 Jul 2006 13:47:56 -0000       1.37
+++ getdate.y   7 Jul 2006 02:46:50 -0000       1.38
@@ -70,8 +70,8 @@
 
 
 /* ISDIGIT differs from isdigit, as follows:
-   - Its arg may be any int or unsigned int; it need not be an unsigned char.
-   - It's guaranteed to evaluate its argument exactly once.
+   - Its arg may be any int or unsigned int; it need not be an unsigned char
+     or EOF.
    - It's typically faster.
    POSIX says that only '0' through '9' are digits.  Prefer ISDIGIT to
    isdigit unless it's important to use the locale's definition
@@ -887,7 +887,6 @@
   for (p = word; *p; p++)
     {
       unsigned char ch = *p;
-      if (islower (ch))
        *p = toupper (ch);
     }
 

Index: getopt.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getopt.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- getopt.c    25 Jan 2006 12:53:38 -0000      1.10
+++ getopt.c    7 Jul 2006 02:46:50 -0000       1.11
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#ifdef VMS
+#ifdef __VMS
 # include <unixlib.h>
 #endif
 

Index: getpagesize.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getpagesize.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- getpagesize.h       4 Oct 2005 02:34:54 -0000       1.6
+++ getpagesize.h       7 Jul 2006 02:46:50 -0000       1.7
@@ -21,12 +21,12 @@
 #include <unistd.h>
 
 #if !defined getpagesize && defined _SC_PAGESIZE
-# if !(defined VMS && __VMS_VER < 70000000)
+# if ! (defined __VMS && __VMS_VER < 70000000)
 #  define getpagesize() sysconf (_SC_PAGESIZE)
 # endif
 #endif
 
-#if !defined getpagesize && defined VMS
+#if !defined getpagesize && defined __VMS
 # ifdef __ALPHA
 #  define getpagesize() 8192
 # else

Index: glob.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/glob.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- glob.c      23 Jun 2006 14:28:20 -0000      1.20
+++ glob.c      7 Jul 2006 02:46:50 -0000       1.21
@@ -53,18 +53,7 @@
 #else
 # define dirent direct
 # define NAMLEN(dirent) (dirent)->d_namlen
-# ifdef HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif
-# ifdef HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif
-# ifdef HAVE_NDIR_H
 #  include <ndir.h>
-# endif
-# ifdef HAVE_VMSDIR_H
-#  include "vmsdir.h"
-# endif /* HAVE_VMSDIR_H */
 #endif
 
 
@@ -511,7 +500,6 @@
 
   oldcount = pglob->gl_pathc + pglob->gl_offs;
 
-#ifndef VMS
   if ((flags & (GLOB_TILDE|GLOB_TILDE_CHECK)) && dirname[0] == '~')
     {
       if (dirname[1] == '\0' || dirname[1] == '/')
@@ -679,7 +667,6 @@
        }
 # endif        /* Not Amiga && not WINDOWS32.  */
     }
-#endif /* Not VMS.  */
 
   /* Now test whether we looked for "~" or "~NAME".  In this case we
      can give the answer now.  */
@@ -1132,7 +1119,7 @@
            {
              int fnm_flags = ((!(flags & GLOB_PERIOD) ? FNM_PERIOD : 0)
                               | ((flags & GLOB_NOESCAPE) ? FNM_NOESCAPE : 0)
-#if defined _AMIGA || defined VMS
+#if defined _AMIGA || defined __VMS
                               | FNM_CASEFOLD
 #endif
                               );

Index: regex_internal.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/regex_internal.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- regex_internal.h    11 Apr 2006 20:21:31 -0000      1.11
+++ regex_internal.h    7 Jul 2006 02:46:50 -0000       1.12
@@ -56,7 +56,7 @@
 #endif
 
 /* In case that the system doesn't have isblank().  */
-#if !defined _LIBC && !defined HAVE_ISBLANK && !defined isblank
+#if !defined _LIBC && !HAVE_DECL_ISBLANK && !defined isblank
 # define isblank(ch) ((ch) == ' ' || (ch) == '\t')
 #endif
 

Index: strftime.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/strftime.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- strftime.c  30 Jun 2006 01:58:56 -0000      1.12
+++ strftime.c  7 Jul 2006 02:46:50 -0000       1.13
@@ -278,7 +278,6 @@
 #  define TOLOWER(Ch, L) towlower (Ch)
 # endif
 #else
-# ifdef _LIBC
 #  ifdef USE_IN_EXTENDED_LOCALE_MODEL
 #   define TOUPPER(Ch, L) __toupper_l (Ch, L)
 #   define TOLOWER(Ch, L) __tolower_l (Ch, L)
@@ -286,10 +285,6 @@
 #   define TOUPPER(Ch, L) toupper (Ch)
 #   define TOLOWER(Ch, L) tolower (Ch)
 #  endif
-# else
-#  define TOUPPER(Ch, L) (islower (Ch) ? toupper (Ch) : (Ch))
-#  define TOLOWER(Ch, L) (isupper (Ch) ? tolower (Ch) : (Ch))
-# endif
 #endif
 /* We don't use `isdigit' here since the locale dependent
    interpretation is not what we want here.  We only need to accept