cvs-cvs
[Top][All Lists]
Advanced

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

[Cvs-cvs] ccvs/lib ChangeLog Makefile.am Makefile.gnulib ...


From: Derek Robert Price
Subject: [Cvs-cvs] ccvs/lib ChangeLog Makefile.am Makefile.gnulib ...
Date: Mon, 27 Aug 2007 02:11:37 +0000

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     07/08/27 02:11:37

Modified files:
        lib            : ChangeLog Makefile.am Makefile.gnulib 
                         Makefile.in getdelim.c getline.c getpass.c 
                         stdio_.h yesno.c 
Removed files:
        lib            : getdelim.h getline.h 

Log message:
        * Makefile.am: Import changes from...
        * Makefile.gnulib: ...this autogenerated file.
        * getdelim.c, getline.c, stdio_.h, yesno.c: Update from GNULIB.
        * getdelim.h, getline.h: Remove obsolete files.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/ChangeLog?cvsroot=cvs&r1=1.553&r2=1.554
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/Makefile.am?cvsroot=cvs&r1=1.127&r2=1.128
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/Makefile.gnulib?cvsroot=cvs&r1=1.90&r2=1.91
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/Makefile.in?cvsroot=cvs&r1=1.230&r2=1.231
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/getdelim.c?cvsroot=cvs&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/getline.c?cvsroot=cvs&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/getpass.c?cvsroot=cvs&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/stdio_.h?cvsroot=cvs&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/yesno.c?cvsroot=cvs&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/getdelim.h?cvsroot=cvs&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/getline.h?cvsroot=cvs&r1=1.15&r2=0

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/ChangeLog,v
retrieving revision 1.553
retrieving revision 1.554
diff -u -b -r1.553 -r1.554
--- ChangeLog   24 Aug 2007 18:06:23 -0000      1.553
+++ ChangeLog   27 Aug 2007 02:11:36 -0000      1.554
@@ -1,3 +1,10 @@
+2007-08-26  Derek Price  <address@hidden>
+
+       * Makefile.am: Import changes from...
+       * Makefile.gnulib: ...this autogenerated file.
+       * getdelim.c, getline.c, stdio_.h, yesno.c: Update from GNULIB.
+       * getdelim.h, getline.h: Remove obsolete files.
+
 2007-08-24  Derek Price  <address@hidden>
 
        * Makefile.am: Import automated changes from...

Index: Makefile.am
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/Makefile.am,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- Makefile.am 24 Aug 2007 18:06:23 -0000      1.127
+++ Makefile.am 27 Aug 2007 02:11:36 -0000      1.128
@@ -516,7 +516,7 @@
 ## begin gnulib module getdelim
 
 
-EXTRA_DIST += getdelim.c getdelim.h
+EXTRA_DIST += getdelim.c
 
 EXTRA_libcvs_a_SOURCES += getdelim.c
 
@@ -534,7 +534,7 @@
 ## begin gnulib module getline
 
 
-EXTRA_DIST += getline.c getline.h
+EXTRA_DIST += getline.c
 
 EXTRA_libcvs_a_SOURCES += getline.c
 
@@ -1217,6 +1217,8 @@
              -e 's|@''GNULIB_FTELL''@|$(GNULIB_FTELL)|g' \
              -e 's|@''GNULIB_FTELLO''@|$(GNULIB_FTELLO)|g' \
              -e 's|@''GNULIB_FFLUSH''@|$(GNULIB_FFLUSH)|g' \
+             -e 's|@''GNULIB_GETDELIM''@|$(GNULIB_GETDELIM)|g' \
+             -e 's|@''GNULIB_GETLINE''@|$(GNULIB_GETLINE)|g' \
              -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \
              -e 's|@''REPLACE_VFPRINTF''@|$(REPLACE_VFPRINTF)|g' \
              -e 's|@''REPLACE_PRINTF''@|$(REPLACE_PRINTF)|g' \
@@ -1234,6 +1236,9 @@
              -e 's|@''REPLACE_FTELLO''@|$(REPLACE_FTELLO)|g' \
              -e 's|@''REPLACE_FTELL''@|$(REPLACE_FTELL)|g' \
              -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \
+             -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \
+             -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \
+             -e 's|@''REPLACE_GETLINE''@|$(REPLACE_GETLINE)|g' \
              -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
              < $(srcdir)/stdio_.h; \
        } > address@hidden

Index: Makefile.gnulib
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/Makefile.gnulib,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- Makefile.gnulib     24 Aug 2007 18:06:23 -0000      1.90
+++ Makefile.gnulib     27 Aug 2007 02:11:36 -0000      1.91
@@ -461,7 +461,7 @@
 ## begin gnulib module getdelim
 
 
-EXTRA_DIST += getdelim.c getdelim.h
+EXTRA_DIST += getdelim.c
 
 EXTRA_libcvs_a_SOURCES += getdelim.c
 
@@ -479,7 +479,7 @@
 ## begin gnulib module getline
 
 
-EXTRA_DIST += getline.c getline.h
+EXTRA_DIST += getline.c
 
 EXTRA_libcvs_a_SOURCES += getline.c
 
@@ -1161,6 +1161,8 @@
              -e 's|@''GNULIB_FTELL''@|$(GNULIB_FTELL)|g' \
              -e 's|@''GNULIB_FTELLO''@|$(GNULIB_FTELLO)|g' \
              -e 's|@''GNULIB_FFLUSH''@|$(GNULIB_FFLUSH)|g' \
+             -e 's|@''GNULIB_GETDELIM''@|$(GNULIB_GETDELIM)|g' \
+             -e 's|@''GNULIB_GETLINE''@|$(GNULIB_GETLINE)|g' \
              -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \
              -e 's|@''REPLACE_VFPRINTF''@|$(REPLACE_VFPRINTF)|g' \
              -e 's|@''REPLACE_PRINTF''@|$(REPLACE_PRINTF)|g' \
@@ -1178,6 +1180,9 @@
              -e 's|@''REPLACE_FTELLO''@|$(REPLACE_FTELLO)|g' \
              -e 's|@''REPLACE_FTELL''@|$(REPLACE_FTELL)|g' \
              -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \
+             -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \
+             -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \
+             -e 's|@''REPLACE_GETLINE''@|$(REPLACE_GETLINE)|g' \
              -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
              < $(srcdir)/stdio_.h; \
        } > address@hidden

Index: Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/Makefile.in,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -b -r1.230 -r1.231
--- Makefile.in 24 Aug 2007 18:06:23 -0000      1.230
+++ Makefile.in 27 Aug 2007 02:11:36 -0000      1.231
@@ -92,29 +92,25 @@
        $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettime.m4 \
        $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \
        $(top_srcdir)/m4/glob.m4 $(top_srcdir)/m4/gnulib-common.m4 \
-       $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \
+       $(top_srcdir)/m4/gnulib-comp.m4 \
        $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_ntop.m4 \
-       $(top_srcdir)/m4/inline.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-       $(top_srcdir)/m4/intmax_t.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
-       $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
-       $(top_srcdir)/m4/lchmod.m4 $(top_srcdir)/m4/lchown.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-       $(top_srcdir)/m4/lib-prefix.m4 \
-       $(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/longlong.m4 \
-       $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
-       $(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/mbchar.m4 \
-       $(top_srcdir)/m4/mbiter.m4 $(top_srcdir)/m4/mbrtowc.m4 \
-       $(top_srcdir)/m4/mbslen.m4 $(top_srcdir)/m4/mbsstr.m4 \
-       $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/md5.m4 \
-       $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/memmove.m4 \
-       $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
-       $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkancesdirs.m4 \
-       $(top_srcdir)/m4/mkdir-p.m4 $(top_srcdir)/m4/mkdir-slash.m4 \
-       $(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/mktime.m4 \
-       $(top_srcdir)/m4/nanosleep.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
-       $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openat.m4 \
-       $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/po.m4 \
-       $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quote.m4 \
+       $(top_srcdir)/m4/inline.m4 $(top_srcdir)/m4/intmax_t.m4 \
+       $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
+       $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lchmod.m4 \
+       $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/localcharset.m4 \
+       $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
+       $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/malloca.m4 \
+       $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \
+       $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbslen.m4 \
+       $(top_srcdir)/m4/mbsstr.m4 $(top_srcdir)/m4/mbstate_t.m4 \
+       $(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/memchr.m4 \
+       $(top_srcdir)/m4/memmove.m4 $(top_srcdir)/m4/mempcpy.m4 \
+       $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/minmax.m4 \
+       $(top_srcdir)/m4/mkancesdirs.m4 $(top_srcdir)/m4/mkdir-p.m4 \
+       $(top_srcdir)/m4/mkdir-slash.m4 $(top_srcdir)/m4/mkstemp.m4 \
+       $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/nanosleep.m4 \
+       $(top_srcdir)/m4/netinet_in_h.m4 $(top_srcdir)/m4/openat.m4 \
+       $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/quote.m4 \
        $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/readlink.m4 \
        $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rename.m4 \
        $(top_srcdir)/m4/rpmatch.m4 $(top_srcdir)/m4/save-cwd.m4 \
@@ -227,8 +223,6 @@
 GETOPT_H = @GETOPT_H@
 GLIBC21 = @GLIBC21@
 GLOB_H = @GLOB_H@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_FCHDIR = @GNULIB_FCHDIR@
@@ -240,6 +234,8 @@
 GNULIB_FTELLO = @GNULIB_FTELLO@
 GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
 GNULIB_GETCWD = @GNULIB_GETCWD@
+GNULIB_GETDELIM = @GNULIB_GETDELIM@
+GNULIB_GETLINE = @GNULIB_GETLINE@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
 GNULIB_IMAXABS = @GNULIB_IMAXABS@
@@ -290,6 +286,8 @@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
 GPG = @GPG@
 GREP = @GREP@
+HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
+HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
 HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
@@ -355,30 +353,23 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 INTTYPES_H = @INTTYPES_H@
 KRB4 = @KRB4@
 LDFLAGS = @LDFLAGS@
 LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
 LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
-LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
 NETINET_IN_H = @NETINET_IN_H@
 NEXT_DIRENT_H = @NEXT_DIRENT_H@
 NEXT_FCNTL_H = @NEXT_FCNTL_H@
@@ -406,7 +397,6 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
-POSUB = @POSUB@
 PR = @PR@
 PRIPTR_PREFIX = @PRIPTR_PREFIX@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
@@ -422,6 +412,7 @@
 REPLACE_FTELL = @REPLACE_FTELL@
 REPLACE_FTELLO = @REPLACE_FTELLO@
 REPLACE_GETCWD = @REPLACE_GETCWD@
+REPLACE_GETLINE = @REPLACE_GETLINE@
 REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
 REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
@@ -455,14 +446,11 @@
 SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
 TEXI2DVI = @TEXI2DVI@
 TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WCHAR_H = @WCHAR_H@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
 WCTYPE_H = @WCTYPE_H@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
@@ -582,9 +570,9 @@
        float_.h fnmatch.c fnmatch_.h fnmatch_loop.c __fpending.c \
        __fpending.h fseeko.c ftello.c ftruncate.c gai_strerror.c \
        getaddrinfo.c getaddrinfo.h getcwd.c getdate.c getdate.h \
-       getdelim.c getdelim.h gethostname.c getline.c getline.h \
-       getlogin_r.c getndelim2.c getndelim2.h getopt.c getopt1.c \
-       getopt_.h getopt_int.h getpagesize.h getpass.c getpass.h \
+       getdelim.c gethostname.c getline.c getlogin_r.c getndelim2.c \
+       getndelim2.h getopt.c getopt1.c getopt_.h getopt_int.h \
+       getpagesize.h getpass.c getpass.h \
        $(top_srcdir)/build-aux/config.rpath gettime.c gettimeofday.c \
        glob-libc.h glob.c glob_.h \
        $(top_srcdir)/build-aux/config.rpath inet_ntop.c inet_ntop.h \
@@ -1439,6 +1427,8 @@
              -e 's|@''GNULIB_FTELL''@|$(GNULIB_FTELL)|g' \
              -e 's|@''GNULIB_FTELLO''@|$(GNULIB_FTELLO)|g' \
              -e 's|@''GNULIB_FFLUSH''@|$(GNULIB_FFLUSH)|g' \
+             -e 's|@''GNULIB_GETDELIM''@|$(GNULIB_GETDELIM)|g' \
+             -e 's|@''GNULIB_GETLINE''@|$(GNULIB_GETLINE)|g' \
              -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \
              -e 's|@''REPLACE_VFPRINTF''@|$(REPLACE_VFPRINTF)|g' \
              -e 's|@''REPLACE_PRINTF''@|$(REPLACE_PRINTF)|g' \
@@ -1456,6 +1446,9 @@
              -e 's|@''REPLACE_FTELLO''@|$(REPLACE_FTELLO)|g' \
              -e 's|@''REPLACE_FTELL''@|$(REPLACE_FTELL)|g' \
              -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \
+             -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \
+             -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \
+             -e 's|@''REPLACE_GETLINE''@|$(REPLACE_GETLINE)|g' \
              -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
              < $(srcdir)/stdio_.h; \
        } > address@hidden

Index: getdelim.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getdelim.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- getdelim.c  22 Aug 2007 12:48:40 -0000      1.8
+++ getdelim.c  27 Aug 2007 02:11:36 -0000      1.9
@@ -1,5 +1,5 @@
 /* getdelim.c --- Implementation of replacement getdelim function.
-   Copyright (C) 1994, 1996, 1997, 1998, 2001, 2003, 2005, 2006 Free
+   Copyright (C) 1994, 1996, 1997, 1998, 2001, 2003, 2005, 2006, 2007 Free
    Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
@@ -21,7 +21,7 @@
 
 #include <config.h>
 
-#include "getdelim.h"
+#include <stdio.h>
 
 #include <limits.h>
 #include <stdlib.h>
@@ -42,6 +42,11 @@
 # define funlockfile(x) ((void) 0)
 #endif
 
+/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW.  */
+#ifndef EOVERFLOW
+# define EOVERFLOW E2BIG
+#endif
+
 /* Read up to (and including) a DELIMITER from FP into *LINEPTR (and
    NUL-terminate it).  *LINEPTR is a pointer returned from malloc (or
    NULL), pointing to *N characters of space.  It is realloc'ed as
@@ -65,7 +70,7 @@
   if (*lineptr == NULL || *n == 0)
     {
       *n = 120;
-      *lineptr = (char *) malloc (*n);
+      *lineptr = (char *) realloc (*lineptr, *n);
       if (*lineptr == NULL)
        {
          result = -1;
@@ -97,6 +102,7 @@
          if (cur_len + 1 >= needed)
            {
              result = -1;
+             errno = EOVERFLOW;
              goto unlock_return;
            }
 
@@ -121,6 +127,7 @@
   result = cur_len ? cur_len : result;
 
  unlock_return:
-  funlockfile (fp);
+  funlockfile (fp); /* doesn't set errno */
+
   return result;
 }

Index: getline.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getline.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- getline.c   22 Aug 2007 12:48:40 -0000      1.20
+++ getline.c   27 Aug 2007 02:11:36 -0000      1.21
@@ -1,5 +1,5 @@
 /* getline.c --- Implementation of replacement getline function.
-   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007 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
@@ -20,8 +20,7 @@
 
 #include <config.h>
 
-#include "getdelim.h"
-#include "getline.h"
+#include <stdio.h>
 
 ssize_t
 getline (char **lineptr, size_t *n, FILE *stream)

Index: getpass.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getpass.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- getpass.c   22 Aug 2007 12:48:40 -0000      1.14
+++ getpass.c   27 Aug 2007 02:11:37 -0000      1.15
@@ -41,8 +41,6 @@
 # include <termios.h>
 #endif
 
-#include "getline.h"
-
 #if USE_UNLOCKED_IO
 # include "unlocked-io.h"
 #else

Index: stdio_.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/stdio_.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- stdio_.h    22 Aug 2007 12:48:45 -0000      1.1
+++ stdio_.h    27 Aug 2007 02:11:37 -0000      1.2
@@ -35,8 +35,11 @@
 #include <stdarg.h>
 #include <stddef.h>
 
-#if (@GNULIB_FSEEKO@ && @REPLACE_FSEEKO@) || (@GNULIB_FTELLO@ && 
@REPLACE_FTELLO@)
-/* Get off_t.  */
+#if (@GNULIB_FSEEKO@ && @REPLACE_FSEEKO@) \
+  || (@GNULIB_FTELLO@ && @REPLACE_FTELLO@) \
+  || (@GNULIB_GETDELIM@ && address@hidden@) \
+  || (@GNULIB_GETLINE@ && (address@hidden@ || @REPLACE_GETLINE@))
+/* Get off_t and ssize_t.  */
 # include <sys/types.h>
 #endif
 
@@ -303,6 +306,44 @@
     fflush (f))
 #endif
 
+#if @GNULIB_GETDELIM@
+# if address@hidden@
+  /* Read up to (and including) a DELIMITER from FP into *LINEPTR (and
+     NUL-terminate it).  *LINEPTR is a pointer returned from malloc (or
+     NULL), pointing to *N characters of space.  It is realloc'ed as
+     necessary.  Returns the number of characters read (not including
+     the null terminator), or -1 on error or EOF.  */
+  extern ssize_t getdelim (char **, size_t *, int delim, FILE *);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef getdelim
+# define getdelim(l, s, d, f)                                      \
+  (GL_LINK_WARNING ("getdelim is unportable - "                            \
+                   "use gnulib module getdelim for portability"),  \
+   getdelim (l, s, d, f))
+#endif
+
+#if @GNULIB_GETLINE@
+# if @REPLACE_GETLINE@
+#  undef getline
+#  define getline rpl_getline
+# endif
+# if address@hidden@ || @REPLACE_GETLINE@
+  /* Read up to (and including) a newline from FP into *LINEPTR (and
+     NUL-terminate it).  *LINEPTR is a pointer returned from malloc (or
+     NULL), pointing to *N characters of space.  It is realloc'ed as
+     necessary.  Returns the number of characters read (not including
+     the null terminator), or -1 on error or EOF.  */
+  extern ssize_t getline (char **, size_t *, FILE *);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef getline
+# define getline(l, s, f)                                              \
+  (GL_LINK_WARNING ("getline is unportable - "                         \
+                   "use gnulib module getline for portability"),       \
+   getline (l, s, f))
+#endif
+
 #ifdef __cplusplus
 }
 #endif

Index: yesno.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/yesno.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- yesno.c     22 Aug 2007 12:48:48 -0000      1.10
+++ yesno.c     27 Aug 2007 02:11:37 -0000      1.11
@@ -24,10 +24,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#if ENABLE_NLS
-# include "getline.h"
-#endif
-
 extern int rpmatch (char const *response);
 
 /* Return true if we read an affirmative line from standard input.

Index: getdelim.h
===================================================================
RCS file: getdelim.h
diff -N getdelim.h
--- getdelim.h  12 Aug 2005 20:58:10 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-/* getdelim.h --- Prototype for replacement getdelim function.
-   Copyright (C) 2005 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 the Free Software Foundation; either version 2, or (at
-   your option) any later version.
-
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
-
-/* Written by Simon Josefsson. */
-
-/* Get size_t, FILE, ssize_t.  And getdelim, if available.  */
-# include <stddef.h>
-# include <stdio.h>
-# include <sys/types.h>
-
-#if !HAVE_DECL_GETDELIM
-ssize_t getdelim (char **lineptr, size_t *n, int delimiter, FILE *stream);
-#endif /* !HAVE_GETDELIM */

Index: getline.h
===================================================================
RCS file: getline.h
diff -N getline.h
--- getline.h   12 Aug 2005 20:58:10 -0000      1.15
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-/* getline.h --- Prototype for replacement getline function.
-   Copyright (C) 2005 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 the Free Software Foundation; either version 2, or (at
-   your option) any later version.
-
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
-
-/* Written by Simon Josefsson. */
-
-/* Get size_t, FILE, ssize_t.  And getline, if available.  */
-# include <stddef.h>
-# include <stdio.h>
-# include <sys/types.h>
-
-#if !HAVE_DECL_GETLINE
-ssize_t getline (char **lineptr, size_t *n, FILE *stream);
-#endif /* !HAVE_GETLINE */




reply via email to

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