[Cvs-cvs] ccvs/lib ChangeLog Makefile.in getcwd.c getndel...

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     06/07/11 16:40:33

Modified files:
        lib            : ChangeLog Makefile.in getcwd.c getndelim2.h 
                         glob.c glob_.h 

Log message:
        * getcwd.c, getndelim2.h, glob.c, glob_.h: Update from GNULIB.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/ChangeLog?cvsroot=cvs&r1=1.540&r2=1.541
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/Makefile.in?cvsroot=cvs&r1=1.218&r2=1.219
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/getcwd.c?cvsroot=cvs&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/getndelim2.h?cvsroot=cvs&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/glob.c?cvsroot=cvs&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/glob_.h?cvsroot=cvs&r1=1.17&r2=1.18

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/ChangeLog,v
retrieving revision 1.540
retrieving revision 1.541
diff -u -b -r1.540 -r1.541
--- ChangeLog   11 Jul 2006 16:39:31 -0000      1.540
+++ ChangeLog   11 Jul 2006 16:40:33 -0000      1.541
@@ -1,5 +1,7 @@
 2006-07-11  Derek Price  <address@hidden>
 
+       * getcwd.c, getndelim2.h, glob.c, glob_.h: Update from GNULIB.
+
        * system.h: Ignore obsolescent !HAVE_DIRENT_H and HAVE_DIRECT_H cases.
 
 2006-07-10  Jim Hyslop <address@hidden>

Index: Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/Makefile.in,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -b -r1.218 -r1.219
--- Makefile.in 6 Jul 2006 13:47:56 -0000       1.218
+++ Makefile.in 11 Jul 2006 16:40:33 -0000      1.219
@@ -130,8 +130,7 @@
        $(top_srcdir)/m4/mkdir-slash.m4 $(top_srcdir)/m4/mkstemp.m4 \
        $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/mmap-anon.m4 \
        $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/nls.m4 \
-       $(top_srcdir)/m4/onceonly_2_57.m4 $(top_srcdir)/m4/openat.m4 \
-       $(top_srcdir)/m4/pagealign_alloc.m4 \
+       $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/pagealign_alloc.m4 \
        $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/po.m4 \
        $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quotearg.m4 \
        $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \

Index: getcwd.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getcwd.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- getcwd.c    7 Jul 2006 02:46:50 -0000       1.10
+++ getcwd.c    11 Jul 2006 16:40:33 -0000      1.11
@@ -36,13 +36,7 @@
 # define __set_errno(val) (errno = (val))
 #endif
 
-#if HAVE_DIRENT_H || _LIBC
-# include <dirent.h>
-#else
-# define dirent direct
-# define _D_EXACT_NAMLEN(d) (d)->d_namlen
-# include <ndir.h>
-#endif
+#include <dirent.h>
 #ifndef _D_EXACT_NAMLEN
 # define _D_EXACT_NAMLEN(d) strlen ((d)->d_name)
 #endif

Index: getndelim2.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getndelim2.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- getndelim2.h        23 May 2005 17:44:31 -0000      1.7
+++ getndelim2.h        11 Jul 2006 16:40:33 -0000      1.8
@@ -1,7 +1,7 @@
 /* getndelim2 - Read a line from a stream, stopping at one of 2 delimiters,
    with bounded memory allocation.
 
-   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -31,8 +31,8 @@
    the buffer as necessary, but if NMAX is not GETNLINE_NO_LIMIT
    then do not allocate more than NMAX bytes; if the line is longer
    than that, read and discard the extra bytes.  Stop reading after
-   after the first occurrence of DELIM1 or DELIM2, whichever comes
-   first; a delimiter equal to EOF stands for no delimiter.  Read the
+   the first occurrence of DELIM1 or DELIM2, whichever comes first;
+   a delimiter equal to EOF stands for no delimiter.  Read the
    input bytes from STREAM.
    Return the number of bytes read and stored at *LINEPTR + OFFSET (not
    including the NUL terminator), or -1 on error or EOF.  */

Index: glob.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/glob.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- glob.c      7 Jul 2006 02:46:50 -0000       1.21
+++ glob.c      11 Jul 2006 16:40:33 -0000      1.22
@@ -47,20 +47,12 @@
 # define __set_errno(val) errno = (val)
 #endif
 
-#if defined HAVE_DIRENT_H || defined __GNU_LIBRARY__
-# include <dirent.h>
-# define NAMLEN(dirent) strlen((dirent)->d_name)
-#else
-# define dirent direct
-# define NAMLEN(dirent) (dirent)->d_namlen
-# include <ndir.h>
-#endif
+#include <dirent.h>
 
 
 /* In GNU systems, <dirent.h> defines this macro for us.  */
-#ifdef _D_NAMLEN
-# undef NAMLEN
-# define NAMLEN(d) _D_NAMLEN(d)
+#ifndef _D_EXACT_NAMLEN
+# define _D_EXACT_NAMLEN(dirent) strlen ((dirent)->d_name)
 #endif
 
 /* When used in the GNU libc the symbol _DIRENT_HAVE_D_TYPE is available
@@ -86,13 +78,6 @@
 
 /* If the system has the `struct dirent64' type we use it internally.  */
 #if defined _LIBC && !defined COMPILE_GLOB64
-# if defined HAVE_DIRENT_H || defined __GNU_LIBRARY__
-#  define CONVERT_D_NAMLEN(d64, d32)
-# else
-#  define CONVERT_D_NAMLEN(d64, d32) \
-  (d64)->d_namlen = (d32)->d_namlen;
-# endif
-
 # if (defined POSIX || defined WINDOWS32) && !defined __GNU_LIBRARY__
 #  define CONVERT_D_INO(d64, d32)
 # else
@@ -108,8 +93,7 @@
 # endif
 
 # define CONVERT_DIRENT_DIRENT64(d64, d32) \
-  memcpy ((d64)->d_name, (d32)->d_name, NAMLEN (d32) + 1);                   \
-  CONVERT_D_NAMLEN (d64, d32)                                                \
+  memcpy ((d64)->d_name, (d32)->d_name, _D_EXACT_NAMLEN (d32) + 1);          \
   CONVERT_D_INO (d64, d32)                                                   \
   CONVERT_D_TYPE (d64, d32)
 #endif
@@ -1192,7 +1176,7 @@
                          struct globlink *new =
                            __alloca (sizeof (struct globlink));
                          char *p;
-                         len = NAMLEN (d);
+                         len = _D_EXACT_NAMLEN (d);
                          new->name =
                            malloc (len + 1 + ((flags & GLOB_MARK) && isdir));
                          if (new->name == NULL)

Index: glob_.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/glob_.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- glob_.h     25 Jan 2006 12:53:38 -0000      1.17
+++ glob_.h     11 Jul 2006 16:40:33 -0000      1.18
@@ -46,10 +46,6 @@
 #endif
 
 
-#ifndef HAVE_DIRENT_H
-# define dirent direct
-#endif
-
 #define glob rpl_glob
 #define globfree rpl_globfree
 #define glob_pattern_p rpl_glob_pattern_p