From f65ff498305a5d6cb8f35b86c3cdcaf67b270b09 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sun, 9 Oct 2011 22:43:21 +0100 Subject: * gnulib: Import getline module (used in lib/encodings.c). --- ChangeLog | 4 + Makefile.in | 2 + aclocal.m4 | 2 + config.h.in | 17 + configure | 841 ++++++++++++++++++++++++++++++++-------------- docs/Makefile.in | 2 + gnulib/lib/Makefile.am | 20 +- gnulib/lib/Makefile.in | 66 ++-- gnulib/lib/getdelim.c | 137 ++++++++ gnulib/lib/getline.c | 29 ++ gnulib/m4/getdelim.m4 | 86 +++++ gnulib/m4/getline.m4 | 94 ++++++ gnulib/m4/gnulib-cache.m4 | 3 +- gnulib/m4/gnulib-comp.m4 | 18 + lib/Makefile.in | 2 + libdb/Makefile.in | 2 + man/Makefile.in | 2 + man/de/Makefile.in | 2 + man/es/Makefile.in | 2 + man/fr/Makefile.in | 2 + man/id/Makefile.in | 2 + man/it/Makefile.in | 2 + man/ja/Makefile.in | 2 + man/nl/Makefile.in | 2 + man/pl/Makefile.in | 2 + man/po4a/Makefile.in | 2 + man/ru/Makefile.in | 2 + manual/Makefile.in | 2 + src/Makefile.in | 2 + src/tests/Makefile.in | 2 + tools/Makefile.in | 2 + 31 files changed, 1065 insertions(+), 290 deletions(-) create mode 100644 gnulib/lib/getdelim.c create mode 100644 gnulib/lib/getline.c create mode 100644 gnulib/m4/getdelim.m4 create mode 100644 gnulib/m4/getline.m4 diff --git a/ChangeLog b/ChangeLog index c9733116..2e5032a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Oct 9 22:42:00 BST 2011 Colin Watson + + * gnulib: Import getline module (used in lib/encodings.c). + Sun Oct 9 22:26:15 BST 2011 Colin Watson * man/es/man8/accessdb.man8: Remove; this is simply an out-of-date diff --git a/Makefile.in b/Makefile.in index a58e445a..e652d9ab 100644 --- a/Makefile.in +++ b/Makefile.in @@ -81,7 +81,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-bdb.m4 \ $(top_srcdir)/gnulib/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/gnulib/m4/getcwd-path-max.m4 \ $(top_srcdir)/gnulib/m4/getcwd.m4 \ + $(top_srcdir)/gnulib/m4/getdelim.m4 \ $(top_srcdir)/gnulib/m4/getdtablesize.m4 \ + $(top_srcdir)/gnulib/m4/getline.m4 \ $(top_srcdir)/gnulib/m4/getlogin_r.m4 \ $(top_srcdir)/gnulib/m4/getopt.m4 \ $(top_srcdir)/gnulib/m4/gettext.m4 \ diff --git a/aclocal.m4 b/aclocal.m4 index 5c340439..bed4ecd9 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1253,7 +1253,9 @@ m4_include([gnulib/m4/fnmatch.m4]) m4_include([gnulib/m4/getcwd-abort-bug.m4]) m4_include([gnulib/m4/getcwd-path-max.m4]) m4_include([gnulib/m4/getcwd.m4]) +m4_include([gnulib/m4/getdelim.m4]) m4_include([gnulib/m4/getdtablesize.m4]) +m4_include([gnulib/m4/getline.m4]) m4_include([gnulib/m4/getlogin_r.m4]) m4_include([gnulib/m4/getopt.m4]) m4_include([gnulib/m4/gettext.m4]) diff --git a/config.h.in b/config.h.in index 40efadfa..b6209660 100644 --- a/config.h.in +++ b/config.h.in @@ -180,9 +180,15 @@ /* Define to 1 when the gnulib module getcwd should be tested. */ #undef GNULIB_TEST_GETCWD +/* Define to 1 when the gnulib module getdelim should be tested. */ +#undef GNULIB_TEST_GETDELIM + /* Define to 1 when the gnulib module getdtablesize should be tested. */ #undef GNULIB_TEST_GETDTABLESIZE +/* Define to 1 when the gnulib module getline should be tested. */ +#undef GNULIB_TEST_GETLINE + /* Define to 1 when the gnulib module getlogin_r should be tested. */ #undef GNULIB_TEST_GETLOGIN_R @@ -410,10 +416,18 @@ don't. */ #undef HAVE_DECL_GETC_UNLOCKED +/* Define to 1 if you have the declaration of `getdelim', and to 0 if you + don't. */ +#undef HAVE_DECL_GETDELIM + /* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. */ #undef HAVE_DECL_GETENV +/* Define to 1 if you have the declaration of `getline', and to 0 if you + don't. */ +#undef HAVE_DECL_GETLINE + /* Define to 1 if you have the declaration of `getlogin', and to 0 if you don't. */ #undef HAVE_DECL_GETLOGIN @@ -558,6 +572,9 @@ /* Define to 1 if you have the `getcwd' function. */ #undef HAVE_GETCWD +/* Define to 1 if you have the `getdelim' function. */ +#undef HAVE_GETDELIM + /* Define to 1 if you have the `getdtablesize' function. */ #undef HAVE_GETDTABLESIZE diff --git a/configure b/configure index 973be8ff..4b232c76 100755 --- a/configure +++ b/configure @@ -790,103 +790,6 @@ GNULIB_SIGACTION GNULIB_SIGPROCMASK GNULIB_SIGNAL_H_SIGPIPE GNULIB_PTHREAD_SIGMASK -REPLACE_VSPRINTF -REPLACE_VSNPRINTF -REPLACE_VPRINTF -REPLACE_VFPRINTF -REPLACE_VDPRINTF -REPLACE_VASPRINTF -REPLACE_TMPFILE -REPLACE_STDIO_WRITE_FUNCS -REPLACE_STDIO_READ_FUNCS -REPLACE_SPRINTF -REPLACE_SNPRINTF -REPLACE_RENAMEAT -REPLACE_RENAME -REPLACE_REMOVE -REPLACE_PRINTF -REPLACE_POPEN -REPLACE_PERROR -REPLACE_OBSTACK_PRINTF -REPLACE_GETLINE -REPLACE_GETDELIM -REPLACE_FTELLO -REPLACE_FTELL -REPLACE_FSEEKO -REPLACE_FSEEK -REPLACE_FREOPEN -REPLACE_FPURGE -REPLACE_FPRINTF -REPLACE_FOPEN -REPLACE_FFLUSH -REPLACE_FCLOSE -REPLACE_DPRINTF -HAVE_VDPRINTF -HAVE_VASPRINTF -HAVE_RENAMEAT -HAVE_FTELLO -HAVE_FSEEKO -HAVE_DPRINTF -HAVE_DECL_VSNPRINTF -HAVE_DECL_SNPRINTF -HAVE_DECL_OBSTACK_PRINTF -HAVE_DECL_GETLINE -HAVE_DECL_GETDELIM -HAVE_DECL_FTELLO -HAVE_DECL_FSEEKO -HAVE_DECL_FPURGE -GNULIB_VSPRINTF_POSIX -GNULIB_VSNPRINTF -GNULIB_VPRINTF_POSIX -GNULIB_VPRINTF -GNULIB_VFPRINTF_POSIX -GNULIB_VFPRINTF -GNULIB_VDPRINTF -GNULIB_VSCANF -GNULIB_VFSCANF -GNULIB_VASPRINTF -GNULIB_TMPFILE -GNULIB_STDIO_H_SIGPIPE -GNULIB_STDIO_H_NONBLOCKING -GNULIB_SPRINTF_POSIX -GNULIB_SNPRINTF -GNULIB_SCANF -GNULIB_RENAMEAT -GNULIB_RENAME -GNULIB_REMOVE -GNULIB_PUTS -GNULIB_PUTCHAR -GNULIB_PUTC -GNULIB_PRINTF_POSIX -GNULIB_PRINTF -GNULIB_POPEN -GNULIB_PERROR -GNULIB_OBSTACK_PRINTF_POSIX -GNULIB_OBSTACK_PRINTF -GNULIB_GETS -GNULIB_GETLINE -GNULIB_GETDELIM -GNULIB_GETCHAR -GNULIB_GETC -GNULIB_FWRITE -GNULIB_FTELLO -GNULIB_FTELL -GNULIB_FSEEKO -GNULIB_FSEEK -GNULIB_FSCANF -GNULIB_FREOPEN -GNULIB_FREAD -GNULIB_FPUTS -GNULIB_FPUTC -GNULIB_FPURGE -GNULIB_FPRINTF_POSIX -GNULIB_FPRINTF -GNULIB_FOPEN -GNULIB_FGETS -GNULIB_FGETC -GNULIB_FFLUSH -GNULIB_FCLOSE -GNULIB_DPRINTF APPLE_UNIVERSAL_BUILD UNDEFINE_STRTOK_R REPLACE_STRTOK_R @@ -1001,6 +904,103 @@ GETOPT_H HAVE_GETOPT_H NEXT_AS_FIRST_DIRECTIVE_GETOPT_H NEXT_GETOPT_H +REPLACE_VSPRINTF +REPLACE_VSNPRINTF +REPLACE_VPRINTF +REPLACE_VFPRINTF +REPLACE_VDPRINTF +REPLACE_VASPRINTF +REPLACE_TMPFILE +REPLACE_STDIO_WRITE_FUNCS +REPLACE_STDIO_READ_FUNCS +REPLACE_SPRINTF +REPLACE_SNPRINTF +REPLACE_RENAMEAT +REPLACE_RENAME +REPLACE_REMOVE +REPLACE_PRINTF +REPLACE_POPEN +REPLACE_PERROR +REPLACE_OBSTACK_PRINTF +REPLACE_GETLINE +REPLACE_GETDELIM +REPLACE_FTELLO +REPLACE_FTELL +REPLACE_FSEEKO +REPLACE_FSEEK +REPLACE_FREOPEN +REPLACE_FPURGE +REPLACE_FPRINTF +REPLACE_FOPEN +REPLACE_FFLUSH +REPLACE_FCLOSE +REPLACE_DPRINTF +HAVE_VDPRINTF +HAVE_VASPRINTF +HAVE_RENAMEAT +HAVE_FTELLO +HAVE_FSEEKO +HAVE_DPRINTF +HAVE_DECL_VSNPRINTF +HAVE_DECL_SNPRINTF +HAVE_DECL_OBSTACK_PRINTF +HAVE_DECL_GETLINE +HAVE_DECL_GETDELIM +HAVE_DECL_FTELLO +HAVE_DECL_FSEEKO +HAVE_DECL_FPURGE +GNULIB_VSPRINTF_POSIX +GNULIB_VSNPRINTF +GNULIB_VPRINTF_POSIX +GNULIB_VPRINTF +GNULIB_VFPRINTF_POSIX +GNULIB_VFPRINTF +GNULIB_VDPRINTF +GNULIB_VSCANF +GNULIB_VFSCANF +GNULIB_VASPRINTF +GNULIB_TMPFILE +GNULIB_STDIO_H_SIGPIPE +GNULIB_STDIO_H_NONBLOCKING +GNULIB_SPRINTF_POSIX +GNULIB_SNPRINTF +GNULIB_SCANF +GNULIB_RENAMEAT +GNULIB_RENAME +GNULIB_REMOVE +GNULIB_PUTS +GNULIB_PUTCHAR +GNULIB_PUTC +GNULIB_PRINTF_POSIX +GNULIB_PRINTF +GNULIB_POPEN +GNULIB_PERROR +GNULIB_OBSTACK_PRINTF_POSIX +GNULIB_OBSTACK_PRINTF +GNULIB_GETS +GNULIB_GETLINE +GNULIB_GETDELIM +GNULIB_GETCHAR +GNULIB_GETC +GNULIB_FWRITE +GNULIB_FTELLO +GNULIB_FTELL +GNULIB_FSEEKO +GNULIB_FSEEK +GNULIB_FSCANF +GNULIB_FREOPEN +GNULIB_FREAD +GNULIB_FPUTS +GNULIB_FPUTC +GNULIB_FPURGE +GNULIB_FPRINTF_POSIX +GNULIB_FPRINTF +GNULIB_FOPEN +GNULIB_FGETS +GNULIB_FGETC +GNULIB_FFLUSH +GNULIB_FCLOSE +GNULIB_DPRINTF GL_GENERATE_FNMATCH_H_FALSE GL_GENERATE_FNMATCH_H_TRUE FNMATCH_H @@ -3371,6 +3371,7 @@ gl_func_list="$gl_func_list wmemcpy" gl_func_list="$gl_func_list wmempcpy" gl_header_list="$gl_header_list wctype.h" gl_fnmatch_required=GNU +gl_func_list="$gl_func_list getdelim" gl_func_list="$gl_func_list getdtablesize" gl_func_list="$gl_func_list getlogin_r" gl_getopt_required=GNU @@ -14315,7 +14316,9 @@ fi # Code from module fnmatch-gnu: # Code from module getcwd: # Code from module getcwd-lgpl: + # Code from module getdelim: # Code from module getdtablesize: + # Code from module getline: # Code from module getlogin_r: # Code from module getopt-gnu: # Code from module getopt-posix: @@ -19303,68 +19306,198 @@ _ACEOF - - - - - - ac_fn_c_check_decl "$LINENO" "getlogin_r" "ac_cv_have_decl_getlogin_r" "$ac_includes_default" -if test "x$ac_cv_have_decl_getlogin_r" = xyes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GETLOGIN_R $ac_have_decl -_ACEOF - - - - - - - - - ac_fn_c_check_decl "$LINENO" "getlogin" "ac_cv_have_decl_getlogin" "$ac_includes_default" -if test "x$ac_cv_have_decl_getlogin" = xyes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GETLOGIN $ac_have_decl -_ACEOF - - - - - - - - - - - - - - - - - - : - - - - - - - - - if test $gl_cv_have_include_next = yes; then - gl_cv_next_getopt_h='<'getopt.h'>' - else + GNULIB_DPRINTF=0; + GNULIB_FCLOSE=0; + GNULIB_FFLUSH=0; + GNULIB_FGETC=0; + GNULIB_FGETS=0; + GNULIB_FOPEN=0; + GNULIB_FPRINTF=0; + GNULIB_FPRINTF_POSIX=0; + GNULIB_FPURGE=0; + GNULIB_FPUTC=0; + GNULIB_FPUTS=0; + GNULIB_FREAD=0; + GNULIB_FREOPEN=0; + GNULIB_FSCANF=0; + GNULIB_FSEEK=0; + GNULIB_FSEEKO=0; + GNULIB_FTELL=0; + GNULIB_FTELLO=0; + GNULIB_FWRITE=0; + GNULIB_GETC=0; + GNULIB_GETCHAR=0; + GNULIB_GETDELIM=0; + GNULIB_GETLINE=0; + GNULIB_GETS=0; + GNULIB_OBSTACK_PRINTF=0; + GNULIB_OBSTACK_PRINTF_POSIX=0; + GNULIB_PERROR=0; + GNULIB_POPEN=0; + GNULIB_PRINTF=0; + GNULIB_PRINTF_POSIX=0; + GNULIB_PUTC=0; + GNULIB_PUTCHAR=0; + GNULIB_PUTS=0; + GNULIB_REMOVE=0; + GNULIB_RENAME=0; + GNULIB_RENAMEAT=0; + GNULIB_SCANF=0; + GNULIB_SNPRINTF=0; + GNULIB_SPRINTF_POSIX=0; + GNULIB_STDIO_H_NONBLOCKING=0; + GNULIB_STDIO_H_SIGPIPE=0; + GNULIB_TMPFILE=0; + GNULIB_VASPRINTF=0; + GNULIB_VFSCANF=0; + GNULIB_VSCANF=0; + GNULIB_VDPRINTF=0; + GNULIB_VFPRINTF=0; + GNULIB_VFPRINTF_POSIX=0; + GNULIB_VPRINTF=0; + GNULIB_VPRINTF_POSIX=0; + GNULIB_VSNPRINTF=0; + GNULIB_VSPRINTF_POSIX=0; + HAVE_DECL_FPURGE=1; + HAVE_DECL_FSEEKO=1; + HAVE_DECL_FTELLO=1; + HAVE_DECL_GETDELIM=1; + HAVE_DECL_GETLINE=1; + HAVE_DECL_OBSTACK_PRINTF=1; + HAVE_DECL_SNPRINTF=1; + HAVE_DECL_VSNPRINTF=1; + HAVE_DPRINTF=1; + HAVE_FSEEKO=1; + HAVE_FTELLO=1; + HAVE_RENAMEAT=1; + HAVE_VASPRINTF=1; + HAVE_VDPRINTF=1; + REPLACE_DPRINTF=0; + REPLACE_FCLOSE=0; + REPLACE_FFLUSH=0; + REPLACE_FOPEN=0; + REPLACE_FPRINTF=0; + REPLACE_FPURGE=0; + REPLACE_FREOPEN=0; + REPLACE_FSEEK=0; + REPLACE_FSEEKO=0; + REPLACE_FTELL=0; + REPLACE_FTELLO=0; + REPLACE_GETDELIM=0; + REPLACE_GETLINE=0; + REPLACE_OBSTACK_PRINTF=0; + REPLACE_PERROR=0; + REPLACE_POPEN=0; + REPLACE_PRINTF=0; + REPLACE_REMOVE=0; + REPLACE_RENAME=0; + REPLACE_RENAMEAT=0; + REPLACE_SNPRINTF=0; + REPLACE_SPRINTF=0; + REPLACE_STDIO_READ_FUNCS=0; + REPLACE_STDIO_WRITE_FUNCS=0; + REPLACE_TMPFILE=0; + REPLACE_VASPRINTF=0; + REPLACE_VDPRINTF=0; + REPLACE_VFPRINTF=0; + REPLACE_VPRINTF=0; + REPLACE_VSNPRINTF=0; + REPLACE_VSPRINTF=0; + + + ac_fn_c_check_decl "$LINENO" "getdelim" "ac_cv_have_decl_getdelim" "$ac_includes_default" +if test "x$ac_cv_have_decl_getdelim" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETDELIM $ac_have_decl +_ACEOF + + + + + + + + + + + + + + ac_fn_c_check_decl "$LINENO" "getline" "ac_cv_have_decl_getline" "$ac_includes_default" +if test "x$ac_cv_have_decl_getline" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETLINE $ac_have_decl +_ACEOF + + + + ac_fn_c_check_decl "$LINENO" "getlogin_r" "ac_cv_have_decl_getlogin_r" "$ac_includes_default" +if test "x$ac_cv_have_decl_getlogin_r" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETLOGIN_R $ac_have_decl +_ACEOF + + + + + + + + + ac_fn_c_check_decl "$LINENO" "getlogin" "ac_cv_have_decl_getlogin" "$ac_includes_default" +if test "x$ac_cv_have_decl_getlogin" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETLOGIN $ac_have_decl +_ACEOF + + + + + + + + + + + + + + + + + + : + + + + + + + + + if test $gl_cv_have_include_next = yes; then + gl_cv_next_getopt_h='<'getopt.h'>' + else { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 $as_echo_n "checking absolute name of ... " >&6; } if ${gl_cv_next_getopt_h+:} false; then : @@ -22586,105 +22719,6 @@ $as_echo "#define UNLINK_PARENT_BUG 1" >>confdefs.h - - GNULIB_DPRINTF=0; - GNULIB_FCLOSE=0; - GNULIB_FFLUSH=0; - GNULIB_FGETC=0; - GNULIB_FGETS=0; - GNULIB_FOPEN=0; - GNULIB_FPRINTF=0; - GNULIB_FPRINTF_POSIX=0; - GNULIB_FPURGE=0; - GNULIB_FPUTC=0; - GNULIB_FPUTS=0; - GNULIB_FREAD=0; - GNULIB_FREOPEN=0; - GNULIB_FSCANF=0; - GNULIB_FSEEK=0; - GNULIB_FSEEKO=0; - GNULIB_FTELL=0; - GNULIB_FTELLO=0; - GNULIB_FWRITE=0; - GNULIB_GETC=0; - GNULIB_GETCHAR=0; - GNULIB_GETDELIM=0; - GNULIB_GETLINE=0; - GNULIB_GETS=0; - GNULIB_OBSTACK_PRINTF=0; - GNULIB_OBSTACK_PRINTF_POSIX=0; - GNULIB_PERROR=0; - GNULIB_POPEN=0; - GNULIB_PRINTF=0; - GNULIB_PRINTF_POSIX=0; - GNULIB_PUTC=0; - GNULIB_PUTCHAR=0; - GNULIB_PUTS=0; - GNULIB_REMOVE=0; - GNULIB_RENAME=0; - GNULIB_RENAMEAT=0; - GNULIB_SCANF=0; - GNULIB_SNPRINTF=0; - GNULIB_SPRINTF_POSIX=0; - GNULIB_STDIO_H_NONBLOCKING=0; - GNULIB_STDIO_H_SIGPIPE=0; - GNULIB_TMPFILE=0; - GNULIB_VASPRINTF=0; - GNULIB_VFSCANF=0; - GNULIB_VSCANF=0; - GNULIB_VDPRINTF=0; - GNULIB_VFPRINTF=0; - GNULIB_VFPRINTF_POSIX=0; - GNULIB_VPRINTF=0; - GNULIB_VPRINTF_POSIX=0; - GNULIB_VSNPRINTF=0; - GNULIB_VSPRINTF_POSIX=0; - HAVE_DECL_FPURGE=1; - HAVE_DECL_FSEEKO=1; - HAVE_DECL_FTELLO=1; - HAVE_DECL_GETDELIM=1; - HAVE_DECL_GETLINE=1; - HAVE_DECL_OBSTACK_PRINTF=1; - HAVE_DECL_SNPRINTF=1; - HAVE_DECL_VSNPRINTF=1; - HAVE_DPRINTF=1; - HAVE_FSEEKO=1; - HAVE_FTELLO=1; - HAVE_RENAMEAT=1; - HAVE_VASPRINTF=1; - HAVE_VDPRINTF=1; - REPLACE_DPRINTF=0; - REPLACE_FCLOSE=0; - REPLACE_FFLUSH=0; - REPLACE_FOPEN=0; - REPLACE_FPRINTF=0; - REPLACE_FPURGE=0; - REPLACE_FREOPEN=0; - REPLACE_FSEEK=0; - REPLACE_FSEEKO=0; - REPLACE_FTELL=0; - REPLACE_FTELLO=0; - REPLACE_GETDELIM=0; - REPLACE_GETLINE=0; - REPLACE_OBSTACK_PRINTF=0; - REPLACE_PERROR=0; - REPLACE_POPEN=0; - REPLACE_PRINTF=0; - REPLACE_REMOVE=0; - REPLACE_RENAME=0; - REPLACE_RENAMEAT=0; - REPLACE_SNPRINTF=0; - REPLACE_SPRINTF=0; - REPLACE_STDIO_READ_FUNCS=0; - REPLACE_STDIO_WRITE_FUNCS=0; - REPLACE_TMPFILE=0; - REPLACE_VASPRINTF=0; - REPLACE_VDPRINTF=0; - REPLACE_VFPRINTF=0; - REPLACE_VPRINTF=0; - REPLACE_VSNPRINTF=0; - REPLACE_VSPRINTF=0; - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long file names" >&5 $as_echo_n "checking for long file names... " >&6; } if ${ac_cv_sys_long_file_names+:} false; then : @@ -27299,6 +27333,163 @@ $as_echo "#define GNULIB_TEST_GETCWD 1" >>confdefs.h + + + + : + + + + + + + + : + + + + + + if test $ac_cv_func_getdelim = yes; then + HAVE_GETDELIM=1 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working getdelim function" >&5 +$as_echo_n "checking for working getdelim function... " >&6; } +if ${gl_cv_func_working_getdelim+:} false; then : + $as_echo_n "(cached) " >&6 +else + echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data + if test "$cross_compiling" = yes; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ >= 2) && !defined __UCLIBC__ + Lucky GNU user + #endif +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "Lucky GNU user" >/dev/null 2>&1; then : + gl_cv_func_working_getdelim=yes +else + gl_cv_func_working_getdelim=no +fi +rm -f conftest* + + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# include +# include +# include + int main () + { + FILE *in = fopen ("./conftest.data", "r"); + if (!in) + return 1; + { + /* Test result for a NULL buffer and a zero size. + Based on a test program from Karl Heuer. */ + char *line = NULL; + size_t siz = 0; + int len = getdelim (&line, &siz, '\n', in); + if (!(len == 4 && line && strcmp (line, "foo\n") == 0)) + return 2; + } + { + /* Test result for a NULL buffer and a non-zero size. + This crashes on FreeBSD 8.0. */ + char *line = NULL; + size_t siz = (size_t)(~0) / 4; + if (getdelim (&line, &siz, '\n', in) == -1) + return 3; + } + return 0; + } + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_working_getdelim=yes +else + gl_cv_func_working_getdelim=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_getdelim" >&5 +$as_echo "$gl_cv_func_working_getdelim" >&6; } + if test $gl_cv_func_working_getdelim = no; then + REPLACE_GETDELIM=1 + fi + else + HAVE_GETDELIM=0 + fi + + if test $ac_cv_have_decl_getdelim = no; then + HAVE_DECL_GETDELIM=0 + fi + +if test $HAVE_GETDELIM = 0 || test $REPLACE_GETDELIM = 1; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS getdelim.$ac_objext" + + + for ac_func in flockfile funlockfile +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default" +if test "x$ac_cv_have_decl_getc_unlocked" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl +_ACEOF + + +fi + + + + + + GNULIB_GETDELIM=1 + + + + + +$as_echo "#define GNULIB_TEST_GETDELIM 1" >>confdefs.h + + + + + + : @@ -27342,6 +27533,140 @@ $as_echo "#define GNULIB_TEST_GETDTABLESIZE 1" >>confdefs.h + : + + + + + + + gl_getline_needs_run_time_check=no + ac_fn_c_check_func "$LINENO" "getline" "ac_cv_func_getline" +if test "x$ac_cv_func_getline" = xyes; then : + gl_getline_needs_run_time_check=yes +else + am_cv_func_working_getline=no +fi + + if test $gl_getline_needs_run_time_check = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working getline function" >&5 +$as_echo_n "checking for working getline function... " >&6; } +if ${am_cv_func_working_getline+:} false; then : + $as_echo_n "(cached) " >&6 +else + echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data + if test "$cross_compiling" = yes; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ >= 2) && !defined __UCLIBC__ + Lucky GNU user + #endif +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "Lucky GNU user" >/dev/null 2>&1; then : + am_cv_func_working_getline=yes +else + am_cv_func_working_getline=no +fi +rm -f conftest* + + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# include +# include +# include + int main () + { + FILE *in = fopen ("./conftest.data", "r"); + if (!in) + return 1; + { + /* Test result for a NULL buffer and a zero size. + Based on a test program from Karl Heuer. */ + char *line = NULL; + size_t siz = 0; + int len = getline (&line, &siz, in); + if (!(len == 4 && line && strcmp (line, "foo\n") == 0)) + return 2; + } + { + /* Test result for a NULL buffer and a non-zero size. + This crashes on FreeBSD 8.0. */ + char *line = NULL; + size_t siz = (size_t)(~0) / 4; + if (getline (&line, &siz, in) == -1) + return 3; + } + return 0; + } + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + am_cv_func_working_getline=yes +else + am_cv_func_working_getline=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_working_getline" >&5 +$as_echo "$am_cv_func_working_getline" >&6; } + fi + + if test $ac_cv_have_decl_getline = no; then + HAVE_DECL_GETLINE=0 + fi + + if test $am_cv_func_working_getline = no; then + REPLACE_GETLINE=1 + fi + +if test $REPLACE_GETLINE = 1; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS getline.$ac_objext" + + + : + +fi + + + + + + GNULIB_GETLINE=1 + + + + + +$as_echo "#define GNULIB_TEST_GETLINE 1" >>confdefs.h + + + + + + + + + : diff --git a/docs/Makefile.in b/docs/Makefile.in index 86486dbc..dfe605cd 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -78,7 +78,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-bdb.m4 \ $(top_srcdir)/gnulib/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/gnulib/m4/getcwd-path-max.m4 \ $(top_srcdir)/gnulib/m4/getcwd.m4 \ + $(top_srcdir)/gnulib/m4/getdelim.m4 \ $(top_srcdir)/gnulib/m4/getdtablesize.m4 \ + $(top_srcdir)/gnulib/m4/getline.m4 \ $(top_srcdir)/gnulib/m4/getlogin_r.m4 \ $(top_srcdir)/gnulib/m4/getopt.m4 \ $(top_srcdir)/gnulib/m4/gettext.m4 \ diff --git a/gnulib/lib/Makefile.am b/gnulib/lib/Makefile.am index f85ce7f6..14a0ca1b 100644 --- a/gnulib/lib/Makefile.am +++ b/gnulib/lib/Makefile.am @@ -9,7 +9,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --po-base=gnulib/po --doc-base=doc --tests-base=tests --aux-dir=tools --no-conditional-dependencies --libtool --macro-prefix=gl --po-domain=man-db argp canonicalize dirname error flock fnmatch-gnu getopt-gnu gettext glob idpriv-drop idpriv-droptemp lib-ignore localcharset lock minmax mkdtemp mkstemp regex rename setenv sigaction signal sigprocmask strerror strsep unsetenv warnings xalloc xgetcwd xstrndup xvasprintf +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --po-base=gnulib/po --doc-base=doc --tests-base=tests --aux-dir=tools --no-conditional-dependencies --libtool --macro-prefix=gl --po-domain=man-db argp canonicalize dirname error flock fnmatch-gnu getline getopt-gnu gettext glob idpriv-drop idpriv-droptemp lib-ignore localcharset lock minmax mkdtemp mkstemp regex rename setenv sigaction signal sigprocmask strerror strsep unsetenv warnings xalloc xgetcwd xstrndup xvasprintf AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects @@ -506,6 +506,15 @@ EXTRA_libgnu_la_SOURCES += getcwd-lgpl.c ## end gnulib module getcwd-lgpl +## begin gnulib module getdelim + + +EXTRA_DIST += getdelim.c + +EXTRA_libgnu_la_SOURCES += getdelim.c + +## end gnulib module getdelim + ## begin gnulib module getdtablesize @@ -515,6 +524,15 @@ EXTRA_libgnu_la_SOURCES += getdtablesize.c ## end gnulib module getdtablesize +## begin gnulib module getline + + +EXTRA_DIST += getline.c + +EXTRA_libgnu_la_SOURCES += getline.c + +## end gnulib module getline + ## begin gnulib module getlogin_r diff --git a/gnulib/lib/Makefile.in b/gnulib/lib/Makefile.in index 1daf5dc8..9fb94671 100644 --- a/gnulib/lib/Makefile.in +++ b/gnulib/lib/Makefile.in @@ -24,7 +24,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --po-base=gnulib/po --doc-base=doc --tests-base=tests --aux-dir=tools --no-conditional-dependencies --libtool --macro-prefix=gl --po-domain=man-db argp canonicalize dirname error flock fnmatch-gnu getopt-gnu gettext glob idpriv-drop idpriv-droptemp lib-ignore localcharset lock minmax mkdtemp mkstemp regex rename setenv sigaction signal sigprocmask strerror strsep unsetenv warnings xalloc xgetcwd xstrndup xvasprintf +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --po-base=gnulib/po --doc-base=doc --tests-base=tests --aux-dir=tools --no-conditional-dependencies --libtool --macro-prefix=gl --po-domain=man-db argp canonicalize dirname error flock fnmatch-gnu getline getopt-gnu gettext glob idpriv-drop idpriv-droptemp lib-ignore localcharset lock minmax mkdtemp mkstemp regex rename setenv sigaction signal sigprocmask strerror strsep unsetenv warnings xalloc xgetcwd xstrndup xvasprintf @@ -91,7 +91,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-bdb.m4 \ $(top_srcdir)/gnulib/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/gnulib/m4/getcwd-path-max.m4 \ $(top_srcdir)/gnulib/m4/getcwd.m4 \ + $(top_srcdir)/gnulib/m4/getdelim.m4 \ $(top_srcdir)/gnulib/m4/getdtablesize.m4 \ + $(top_srcdir)/gnulib/m4/getline.m4 \ $(top_srcdir)/gnulib/m4/getlogin_r.m4 \ $(top_srcdir)/gnulib/m4/getopt.m4 \ $(top_srcdir)/gnulib/m4/gettext.m4 \ @@ -1190,23 +1192,24 @@ EXTRA_DIST = alloca.c alloca.in.h areadlink.h btowc.c canonicalize.h \ error.h exitfail.h fchdir.c fcntl.c fcntl.in.h fd-hook.h \ fdopendir.c openat-priv.h openat-proc.c file-set.h \ filenamecat.h float.c float.in.h flock.c fnmatch.c \ - fnmatch.in.h fnmatch_loop.c getcwd.c getcwd-lgpl.c \ - getdtablesize.c getlogin_r.c getopt.c getopt.in.h getopt1.c \ - getopt_int.h $(top_srcdir)/tools/config.rpath gettimeofday.c \ - glob-libc.h glob.c glob.in.h hash.h hash-triple.h \ - $(top_srcdir)/tools/config.rpath idpriv.h idpriv.h intprops.h \ - langinfo.in.h lchown.c config.charset ref-add.sin ref-del.sin \ - lstat.c malloc.c malloc.c malloca.h malloca.valgrind mbrtowc.c \ - mbsinit.c mbsrtowcs-impl.h mbsrtowcs-state.c mbsrtowcs.c \ - mbtowc-impl.h mbtowc.c memchr.c memchr.valgrind mempcpy.c \ - memrchr.c mkdir.c mkdtemp.c mkstemp.c nl_langinfo.c open.c \ - at-func.c fchmodat.c fchownat.c fstatat.c mkdirat.c \ - openat-priv.h openat-proc.c openat.c openat.h unlinkat.c \ - pathmax.h rawmemchr.c rawmemchr.valgrind readlink.c realloc.c \ - regcomp.c regex.c regex.h regex_internal.c regex_internal.h \ - regexec.c rename.c rmdir.c same.h same-inode.h save-cwd.h \ - setenv.c sig-handler.h sigaction.c signal.in.h sigprocmask.c \ - sleep.c $(top_srcdir)/tools/snippet/_Noreturn.h \ + fnmatch.in.h fnmatch_loop.c getcwd.c getcwd-lgpl.c getdelim.c \ + getdtablesize.c getline.c getlogin_r.c getopt.c getopt.in.h \ + getopt1.c getopt_int.h $(top_srcdir)/tools/config.rpath \ + gettimeofday.c glob-libc.h glob.c glob.in.h hash.h \ + hash-triple.h $(top_srcdir)/tools/config.rpath idpriv.h \ + idpriv.h intprops.h langinfo.in.h lchown.c config.charset \ + ref-add.sin ref-del.sin lstat.c malloc.c malloc.c malloca.h \ + malloca.valgrind mbrtowc.c mbsinit.c mbsrtowcs-impl.h \ + mbsrtowcs-state.c mbsrtowcs.c mbtowc-impl.h mbtowc.c memchr.c \ + memchr.valgrind mempcpy.c memrchr.c mkdir.c mkdtemp.c \ + mkstemp.c nl_langinfo.c open.c at-func.c fchmodat.c fchownat.c \ + fstatat.c mkdirat.c openat-priv.h openat-proc.c openat.c \ + openat.h unlinkat.c pathmax.h rawmemchr.c rawmemchr.valgrind \ + readlink.c realloc.c regcomp.c regex.c regex.h \ + regex_internal.c regex_internal.h regexec.c rename.c rmdir.c \ + same.h same-inode.h save-cwd.h setenv.c sig-handler.h \ + sigaction.c signal.in.h sigprocmask.c sleep.c \ + $(top_srcdir)/tools/snippet/_Noreturn.h \ $(top_srcdir)/tools/snippet/arg-nonnull.h \ $(top_srcdir)/tools/snippet/c++defs.h \ $(top_srcdir)/tools/snippet/warn-on-use.h stat.c stdarg.in.h \ @@ -1286,18 +1289,19 @@ EXTRA_libgnu_la_SOURCES = alloca.c btowc.c canonicalize-lgpl.c \ chdir-long.c chown.c fchown-stub.c close.c dirfd.c \ stripslash.c dup2.c error.c fchdir.c fcntl.c fdopendir.c \ openat-proc.c float.c flock.c fnmatch.c fnmatch_loop.c \ - getcwd.c getcwd-lgpl.c getdtablesize.c getlogin_r.c getopt.c \ - getopt1.c gettimeofday.c glob.c lchown.c lstat.c malloc.c \ - malloc.c mbrtowc.c mbsinit.c mbsrtowcs-state.c mbsrtowcs.c \ - mbtowc.c memchr.c mempcpy.c memrchr.c mkdir.c mkdtemp.c \ - mkstemp.c nl_langinfo.c open.c at-func.c fchmodat.c fchownat.c \ - fstatat.c mkdirat.c openat-proc.c openat.c unlinkat.c \ - rawmemchr.c readlink.c realloc.c regcomp.c regex.c \ - regex_internal.c regexec.c rename.c rmdir.c setenv.c \ - sigaction.c sigprocmask.c sleep.c stat.c strchrnul.c strdup.c \ - strerror.c strerror-override.c strndup.c strnlen.c strsep.c \ - unlink.c unsetenv.c asnprintf.c printf-args.c printf-parse.c \ - vasnprintf.c asprintf.c vasprintf.c vsnprintf.c wcrtomb.c + getcwd.c getcwd-lgpl.c getdelim.c getdtablesize.c getline.c \ + getlogin_r.c getopt.c getopt1.c gettimeofday.c glob.c lchown.c \ + lstat.c malloc.c malloc.c mbrtowc.c mbsinit.c \ + mbsrtowcs-state.c mbsrtowcs.c mbtowc.c memchr.c mempcpy.c \ + memrchr.c mkdir.c mkdtemp.c mkstemp.c nl_langinfo.c open.c \ + at-func.c fchmodat.c fchownat.c fstatat.c mkdirat.c \ + openat-proc.c openat.c unlinkat.c rawmemchr.c readlink.c \ + realloc.c regcomp.c regex.c regex_internal.c regexec.c \ + rename.c rmdir.c setenv.c sigaction.c sigprocmask.c sleep.c \ + stat.c strchrnul.c strdup.c strerror.c strerror-override.c \ + strndup.c strnlen.c strsep.c unlink.c unsetenv.c asnprintf.c \ + printf-args.c printf-parse.c vasnprintf.c asprintf.c \ + vasprintf.c vsnprintf.c wcrtomb.c libgnu_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(LTLIBINTL) \ $(LTLIBTHREAD) charset_alias = $(DESTDIR)$(libdir)/charset.alias @@ -1429,7 +1433,9 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstatat.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getcwd-lgpl.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getcwd.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdelim.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdtablesize.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getline.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getlogin_r.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Plo@am__quote@ diff --git a/gnulib/lib/getdelim.c b/gnulib/lib/getdelim.c new file mode 100644 index 00000000..14a8bce8 --- /dev/null +++ b/gnulib/lib/getdelim.c @@ -0,0 +1,137 @@ +/* getdelim.c --- Implementation of replacement getdelim function. + Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2011 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 3, 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. */ + +/* Ported from glibc by Simon Josefsson. */ + +#include + +/* Don't use __attribute__ __nonnull__ in this compilation unit. Otherwise gcc + optimizes away the lineptr == NULL || n == NULL || fp == NULL tests below. */ +#define _GL_ARG_NONNULL(params) + +#include + +#include +#include +#include +#include + +#ifndef SSIZE_MAX +# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2)) +#endif + +#if USE_UNLOCKED_IO +# include "unlocked-io.h" +# define getc_maybe_unlocked(fp) getc(fp) +#elif !HAVE_FLOCKFILE || !HAVE_FUNLOCKFILE || !HAVE_DECL_GETC_UNLOCKED +# undef flockfile +# undef funlockfile +# define flockfile(x) ((void) 0) +# define funlockfile(x) ((void) 0) +# define getc_maybe_unlocked(fp) getc(fp) +#else +# define getc_maybe_unlocked(fp) getc_unlocked(fp) +#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 + necessary. Returns the number of characters read (not including + the null terminator), or -1 on error or EOF. */ + +ssize_t +getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp) +{ + ssize_t result; + size_t cur_len = 0; + + if (lineptr == NULL || n == NULL || fp == NULL) + { + errno = EINVAL; + return -1; + } + + flockfile (fp); + + if (*lineptr == NULL || *n == 0) + { + char *new_lineptr; + *n = 120; + new_lineptr = (char *) realloc (*lineptr, *n); + if (new_lineptr == NULL) + { + result = -1; + goto unlock_return; + } + *lineptr = new_lineptr; + } + + for (;;) + { + int i; + + i = getc_maybe_unlocked (fp); + if (i == EOF) + { + result = -1; + break; + } + + /* Make enough space for len+1 (for final NUL) bytes. */ + if (cur_len + 1 >= *n) + { + size_t needed_max = + SSIZE_MAX < SIZE_MAX ? (size_t) SSIZE_MAX + 1 : SIZE_MAX; + size_t needed = 2 * *n + 1; /* Be generous. */ + char *new_lineptr; + + if (needed_max < needed) + needed = needed_max; + if (cur_len + 1 >= needed) + { + result = -1; + errno = EOVERFLOW; + goto unlock_return; + } + + new_lineptr = (char *) realloc (*lineptr, needed); + if (new_lineptr == NULL) + { + result = -1; + goto unlock_return; + } + + *lineptr = new_lineptr; + *n = needed; + } + + (*lineptr)[cur_len] = i; + cur_len++; + + if (i == delimiter) + break; + } + (*lineptr)[cur_len] = '\0'; + result = cur_len ? cur_len : result; + + unlock_return: + funlockfile (fp); /* doesn't set errno */ + + return result; +} diff --git a/gnulib/lib/getline.c b/gnulib/lib/getline.c new file mode 100644 index 00000000..e6e91872 --- /dev/null +++ b/gnulib/lib/getline.c @@ -0,0 +1,29 @@ +/* getline.c --- Implementation of replacement getline function. + Copyright (C) 2005-2007, 2009-2011 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 3, 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. */ + +#include + +#include + +ssize_t +getline (char **lineptr, size_t *n, FILE *stream) +{ + return getdelim (lineptr, n, '\n', stream); +} diff --git a/gnulib/m4/getdelim.m4 b/gnulib/m4/getdelim.m4 new file mode 100644 index 00000000..6a0f632c --- /dev/null +++ b/gnulib/m4/getdelim.m4 @@ -0,0 +1,86 @@ +# getdelim.m4 serial 9 + +dnl Copyright (C) 2005-2007, 2009-2011 Free Software Foundation, Inc. +dnl +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_PREREQ([2.59]) + +AC_DEFUN([gl_FUNC_GETDELIM], +[ + AC_REQUIRE([gl_STDIO_H_DEFAULTS]) + + dnl Persuade glibc to declare getdelim(). + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) + + AC_CHECK_DECLS_ONCE([getdelim]) + + AC_CHECK_FUNCS_ONCE([getdelim]) + if test $ac_cv_func_getdelim = yes; then + HAVE_GETDELIM=1 + dnl Found it in some library. Verify that it works. + AC_CACHE_CHECK([for working getdelim function], [gl_cv_func_working_getdelim], + [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data + AC_RUN_IFELSE([AC_LANG_SOURCE([[ +# include +# include +# include + int main () + { + FILE *in = fopen ("./conftest.data", "r"); + if (!in) + return 1; + { + /* Test result for a NULL buffer and a zero size. + Based on a test program from Karl Heuer. */ + char *line = NULL; + size_t siz = 0; + int len = getdelim (&line, &siz, '\n', in); + if (!(len == 4 && line && strcmp (line, "foo\n") == 0)) + return 2; + } + { + /* Test result for a NULL buffer and a non-zero size. + This crashes on FreeBSD 8.0. */ + char *line = NULL; + size_t siz = (size_t)(~0) / 4; + if (getdelim (&line, &siz, '\n', in) == -1) + return 3; + } + return 0; + } + ]])], [gl_cv_func_working_getdelim=yes] dnl The library version works. + , [gl_cv_func_working_getdelim=no] dnl The library version does NOT work. + , dnl We're cross compiling. Assume it works on glibc2 systems. + [AC_EGREP_CPP([Lucky GNU user], + [ +#include +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ >= 2) && !defined __UCLIBC__ + Lucky GNU user + #endif +#endif + ], + [gl_cv_func_working_getdelim=yes], + [gl_cv_func_working_getdelim=no])] + )]) + if test $gl_cv_func_working_getdelim = no; then + REPLACE_GETDELIM=1 + fi + else + HAVE_GETDELIM=0 + fi + + if test $ac_cv_have_decl_getdelim = no; then + HAVE_DECL_GETDELIM=0 + fi +]) + +# Prerequisites of lib/getdelim.c. +AC_DEFUN([gl_PREREQ_GETDELIM], +[ + AC_CHECK_FUNCS([flockfile funlockfile]) + AC_CHECK_DECLS([getc_unlocked]) +]) diff --git a/gnulib/m4/getline.m4 b/gnulib/m4/getline.m4 new file mode 100644 index 00000000..4c577972 --- /dev/null +++ b/gnulib/m4/getline.m4 @@ -0,0 +1,94 @@ +# getline.m4 serial 25 + +dnl Copyright (C) 1998-2003, 2005-2007, 2009-2011 Free Software Foundation, +dnl Inc. +dnl +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_PREREQ([2.59]) + +dnl See if there's a working, system-supplied version of the getline function. +dnl We can't just do AC_REPLACE_FUNCS([getline]) because some systems +dnl have a function by that name in -linet that doesn't have anything +dnl to do with the function we need. +AC_DEFUN([gl_FUNC_GETLINE], +[ + AC_REQUIRE([gl_STDIO_H_DEFAULTS]) + + dnl Persuade glibc to declare getline(). + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) + + AC_CHECK_DECLS_ONCE([getline]) + + gl_getline_needs_run_time_check=no + AC_CHECK_FUNC([getline], + [dnl Found it in some library. Verify that it works. + gl_getline_needs_run_time_check=yes], + [am_cv_func_working_getline=no]) + if test $gl_getline_needs_run_time_check = yes; then + AC_CACHE_CHECK([for working getline function], [am_cv_func_working_getline], + [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data + AC_RUN_IFELSE([AC_LANG_SOURCE([[ +# include +# include +# include + int main () + { + FILE *in = fopen ("./conftest.data", "r"); + if (!in) + return 1; + { + /* Test result for a NULL buffer and a zero size. + Based on a test program from Karl Heuer. */ + char *line = NULL; + size_t siz = 0; + int len = getline (&line, &siz, in); + if (!(len == 4 && line && strcmp (line, "foo\n") == 0)) + return 2; + } + { + /* Test result for a NULL buffer and a non-zero size. + This crashes on FreeBSD 8.0. */ + char *line = NULL; + size_t siz = (size_t)(~0) / 4; + if (getline (&line, &siz, in) == -1) + return 3; + } + return 0; + } + ]])], [am_cv_func_working_getline=yes] dnl The library version works. + , [am_cv_func_working_getline=no] dnl The library version does NOT work. + , dnl We're cross compiling. Assume it works on glibc2 systems. + [AC_EGREP_CPP([Lucky GNU user], + [ +#include +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ >= 2) && !defined __UCLIBC__ + Lucky GNU user + #endif +#endif + ], + [am_cv_func_working_getline=yes], + [am_cv_func_working_getline=no])] + )]) + fi + + if test $ac_cv_have_decl_getline = no; then + HAVE_DECL_GETLINE=0 + fi + + if test $am_cv_func_working_getline = no; then + dnl Set REPLACE_GETLINE always: Even if we have not found the broken + dnl getline function among $LIBS, it may exist in libinet and the + dnl executable may be linked with -linet. + REPLACE_GETLINE=1 + fi +]) + +# Prerequisites of lib/getline.c. +AC_DEFUN([gl_PREREQ_GETLINE], +[ + : +]) diff --git a/gnulib/m4/gnulib-cache.m4 b/gnulib/m4/gnulib-cache.m4 index 7f37c6fb..917e84c3 100644 --- a/gnulib/m4/gnulib-cache.m4 +++ b/gnulib/m4/gnulib-cache.m4 @@ -15,7 +15,7 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --po-base=gnulib/po --doc-base=doc --tests-base=tests --aux-dir=tools --no-conditional-dependencies --libtool --macro-prefix=gl --po-domain=man-db argp canonicalize dirname error flock fnmatch-gnu getopt-gnu gettext glob idpriv-drop idpriv-droptemp lib-ignore localcharset lock minmax mkdtemp mkstemp regex rename setenv sigaction signal sigprocmask strerror strsep unsetenv warnings xalloc xgetcwd xstrndup xvasprintf +# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --po-base=gnulib/po --doc-base=doc --tests-base=tests --aux-dir=tools --no-conditional-dependencies --libtool --macro-prefix=gl --po-domain=man-db argp canonicalize dirname error flock fnmatch-gnu getline getopt-gnu gettext glob idpriv-drop idpriv-droptemp lib-ignore localcharset lock minmax mkdtemp mkstemp regex rename setenv sigaction signal sigprocmask strerror strsep unsetenv warnings xalloc xgetcwd xstrndup xvasprintf # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([]) @@ -26,6 +26,7 @@ gl_MODULES([ error flock fnmatch-gnu + getline getopt-gnu gettext glob diff --git a/gnulib/m4/gnulib-comp.m4 b/gnulib/m4/gnulib-comp.m4 index 41c96a0c..21ae8ff2 100644 --- a/gnulib/m4/gnulib-comp.m4 +++ b/gnulib/m4/gnulib-comp.m4 @@ -68,7 +68,9 @@ AC_DEFUN([gl_EARLY], # Code from module fnmatch-gnu: # Code from module getcwd: # Code from module getcwd-lgpl: + # Code from module getdelim: # Code from module getdtablesize: + # Code from module getline: # Code from module getlogin_r: # Code from module getopt-gnu: # Code from module getopt-posix: @@ -325,11 +327,23 @@ if test $REPLACE_GETCWD = 1; then AC_LIBOBJ([getcwd-lgpl]) fi gl_UNISTD_MODULE_INDICATOR([getcwd]) +gl_FUNC_GETDELIM +if test $HAVE_GETDELIM = 0 || test $REPLACE_GETDELIM = 1; then + AC_LIBOBJ([getdelim]) + gl_PREREQ_GETDELIM +fi +gl_STDIO_MODULE_INDICATOR([getdelim]) gl_FUNC_GETDTABLESIZE if test $HAVE_GETDTABLESIZE = 0; then AC_LIBOBJ([getdtablesize]) fi gl_UNISTD_MODULE_INDICATOR([getdtablesize]) +gl_FUNC_GETLINE +if test $REPLACE_GETLINE = 1; then + AC_LIBOBJ([getline]) + gl_PREREQ_GETLINE +fi +gl_STDIO_MODULE_INDICATOR([getline]) gl_FUNC_GETLOGIN_R if test $HAVE_GETLOGIN_R = 0 || test $REPLACE_GETLOGIN_R = 1; then AC_LIBOBJ([getlogin_r]) @@ -860,7 +874,9 @@ AC_DEFUN([gl_FILE_LIST], [ lib/fstatat.c lib/getcwd-lgpl.c lib/getcwd.c + lib/getdelim.c lib/getdtablesize.c + lib/getline.c lib/getlogin_r.c lib/getopt.c lib/getopt.in.h @@ -1036,7 +1052,9 @@ AC_DEFUN([gl_FILE_LIST], [ m4/getcwd-abort-bug.m4 m4/getcwd-path-max.m4 m4/getcwd.m4 + m4/getdelim.m4 m4/getdtablesize.m4 + m4/getline.m4 m4/getlogin_r.m4 m4/getopt.m4 m4/gettext.m4 diff --git a/lib/Makefile.in b/lib/Makefile.in index 8865fe38..228ad4f2 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -79,7 +79,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-bdb.m4 \ $(top_srcdir)/gnulib/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/gnulib/m4/getcwd-path-max.m4 \ $(top_srcdir)/gnulib/m4/getcwd.m4 \ + $(top_srcdir)/gnulib/m4/getdelim.m4 \ $(top_srcdir)/gnulib/m4/getdtablesize.m4 \ + $(top_srcdir)/gnulib/m4/getline.m4 \ $(top_srcdir)/gnulib/m4/getlogin_r.m4 \ $(top_srcdir)/gnulib/m4/getopt.m4 \ $(top_srcdir)/gnulib/m4/gettext.m4 \ diff --git a/libdb/Makefile.in b/libdb/Makefile.in index cba243c1..2d924e9b 100644 --- a/libdb/Makefile.in +++ b/libdb/Makefile.in @@ -79,7 +79,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-bdb.m4 \ $(top_srcdir)/gnulib/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/gnulib/m4/getcwd-path-max.m4 \ $(top_srcdir)/gnulib/m4/getcwd.m4 \ + $(top_srcdir)/gnulib/m4/getdelim.m4 \ $(top_srcdir)/gnulib/m4/getdtablesize.m4 \ + $(top_srcdir)/gnulib/m4/getline.m4 \ $(top_srcdir)/gnulib/m4/getlogin_r.m4 \ $(top_srcdir)/gnulib/m4/getopt.m4 \ $(top_srcdir)/gnulib/m4/gettext.m4 \ diff --git a/man/Makefile.in b/man/Makefile.in index 4bef6c09..46be16dd 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -77,7 +77,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-bdb.m4 \ $(top_srcdir)/gnulib/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/gnulib/m4/getcwd-path-max.m4 \ $(top_srcdir)/gnulib/m4/getcwd.m4 \ + $(top_srcdir)/gnulib/m4/getdelim.m4 \ $(top_srcdir)/gnulib/m4/getdtablesize.m4 \ + $(top_srcdir)/gnulib/m4/getline.m4 \ $(top_srcdir)/gnulib/m4/getlogin_r.m4 \ $(top_srcdir)/gnulib/m4/getopt.m4 \ $(top_srcdir)/gnulib/m4/gettext.m4 \ diff --git a/man/de/Makefile.in b/man/de/Makefile.in index fd3fef34..a4c86787 100644 --- a/man/de/Makefile.in +++ b/man/de/Makefile.in @@ -77,7 +77,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-bdb.m4 \ $(top_srcdir)/gnulib/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/gnulib/m4/getcwd-path-max.m4 \ $(top_srcdir)/gnulib/m4/getcwd.m4 \ + $(top_srcdir)/gnulib/m4/getdelim.m4 \ $(top_srcdir)/gnulib/m4/getdtablesize.m4 \ + $(top_srcdir)/gnulib/m4/getline.m4 \ $(top_srcdir)/gnulib/m4/getlogin_r.m4 \ $(top_srcdir)/gnulib/m4/getopt.m4 \ $(top_srcdir)/gnulib/m4/gettext.m4 \ diff --git a/man/es/Makefile.in b/man/es/Makefile.in index 71a8b127..6bebcb15 100644 --- a/man/es/Makefile.in +++ b/man/es/Makefile.in @@ -77,7 +77,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-bdb.m4 \ $(top_srcdir)/gnulib/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/gnulib/m4/getcwd-path-max.m4 \ $(top_srcdir)/gnulib/m4/getcwd.m4 \ + $(top_srcdir)/gnulib/m4/getdelim.m4 \ $(top_srcdir)/gnulib/m4/getdtablesize.m4 \ + $(top_srcdir)/gnulib/m4/getline.m4 \ $(top_srcdir)/gnulib/m4/getlogin_r.m4 \ $(top_srcdir)/gnulib/m4/getopt.m4 \ $(top_srcdir)/gnulib/m4/gettext.m4 \ diff --git a/man/fr/Makefile.in b/man/fr/Makefile.in index c3c6f914..42bf30d0 100644 --- a/man/fr/Makefile.in +++ b/man/fr/Makefile.in @@ -77,7 +77,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-bdb.m4 \ $(top_srcdir)/gnulib/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/gnulib/m4/getcwd-path-max.m4 \ $(top_srcdir)/gnulib/m4/getcwd.m4 \ + $(top_srcdir)/gnulib/m4/getdelim.m4 \ $(top_srcdir)/gnulib/m4/getdtablesize.m4 \ + $(top_srcdir)/gnulib/m4/getline.m4 \ $(top_srcdir)/gnulib/m4/getlogin_r.m4 \ $(top_srcdir)/gnulib/m4/getopt.m4 \ $(top_srcdir)/gnulib/m4/gettext.m4 \ diff --git a/man/id/Makefile.in b/man/id/Makefile.in index e01576ce..14261aaf 100644 --- a/man/id/Makefile.in +++ b/man/id/Makefile.in @@ -77,7 +77,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-bdb.m4 \ $(top_srcdir)/gnulib/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/gnulib/m4/getcwd-path-max.m4 \ $(top_srcdir)/gnulib/m4/getcwd.m4 \ + $(top_srcdir)/gnulib/m4/getdelim.m4 \ $(top_srcdir)/gnulib/m4/getdtablesize.m4 \ + $(top_srcdir)/gnulib/m4/getline.m4 \ $(top_srcdir)/gnulib/m4/getlogin_r.m4 \ $(top_srcdir)/gnulib/m4/getopt.m4 \ $(top_srcdir)/gnulib/m4/gettext.m4 \ diff --git a/man/it/Makefile.in b/man/it/Makefile.in index ee10b0b0..faa7834e 100644 --- a/man/it/Makefile.in +++ b/man/it/Makefile.in @@ -77,7 +77,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-bdb.m4 \ $(top_srcdir)/gnulib/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/gnulib/m4/getcwd-path-max.m4 \ $(top_srcdir)/gnulib/m4/getcwd.m4 \ + $(top_srcdir)/gnulib/m4/getdelim.m4 \ $(top_srcdir)/gnulib/m4/getdtablesize.m4 \ + $(top_srcdir)/gnulib/m4/getline.m4 \ $(top_srcdir)/gnulib/m4/getlogin_r.m4 \ $(top_srcdir)/gnulib/m4/getopt.m4 \ $(top_srcdir)/gnulib/m4/gettext.m4 \ diff --git a/man/ja/Makefile.in b/man/ja/Makefile.in index 7506c32a..a19cc6e7 100644 --- a/man/ja/Makefile.in +++ b/man/ja/Makefile.in @@ -77,7 +77,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-bdb.m4 \ $(top_srcdir)/gnulib/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/gnulib/m4/getcwd-path-max.m4 \ $(top_srcdir)/gnulib/m4/getcwd.m4 \ + $(top_srcdir)/gnulib/m4/getdelim.m4 \ $(top_srcdir)/gnulib/m4/getdtablesize.m4 \ + $(top_srcdir)/gnulib/m4/getline.m4 \ $(top_srcdir)/gnulib/m4/getlogin_r.m4 \ $(top_srcdir)/gnulib/m4/getopt.m4 \ $(top_srcdir)/gnulib/m4/gettext.m4 \ diff --git a/man/nl/Makefile.in b/man/nl/Makefile.in index eb98712f..a0e842ac 100644 --- a/man/nl/Makefile.in +++ b/man/nl/Makefile.in @@ -77,7 +77,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-bdb.m4 \ $(top_srcdir)/gnulib/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/gnulib/m4/getcwd-path-max.m4 \ $(top_srcdir)/gnulib/m4/getcwd.m4 \ + $(top_srcdir)/gnulib/m4/getdelim.m4 \ $(top_srcdir)/gnulib/m4/getdtablesize.m4 \ + $(top_srcdir)/gnulib/m4/getline.m4 \ $(top_srcdir)/gnulib/m4/getlogin_r.m4 \ $(top_srcdir)/gnulib/m4/getopt.m4 \ $(top_srcdir)/gnulib/m4/gettext.m4 \ diff --git a/man/pl/Makefile.in b/man/pl/Makefile.in index 9ac656fe..6ccdf299 100644 --- a/man/pl/Makefile.in +++ b/man/pl/Makefile.in @@ -77,7 +77,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-bdb.m4 \ $(top_srcdir)/gnulib/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/gnulib/m4/getcwd-path-max.m4 \ $(top_srcdir)/gnulib/m4/getcwd.m4 \ + $(top_srcdir)/gnulib/m4/getdelim.m4 \ $(top_srcdir)/gnulib/m4/getdtablesize.m4 \ + $(top_srcdir)/gnulib/m4/getline.m4 \ $(top_srcdir)/gnulib/m4/getlogin_r.m4 \ $(top_srcdir)/gnulib/m4/getopt.m4 \ $(top_srcdir)/gnulib/m4/gettext.m4 \ diff --git a/man/po4a/Makefile.in b/man/po4a/Makefile.in index 1aedf824..20b170f3 100644 --- a/man/po4a/Makefile.in +++ b/man/po4a/Makefile.in @@ -76,7 +76,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-bdb.m4 \ $(top_srcdir)/gnulib/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/gnulib/m4/getcwd-path-max.m4 \ $(top_srcdir)/gnulib/m4/getcwd.m4 \ + $(top_srcdir)/gnulib/m4/getdelim.m4 \ $(top_srcdir)/gnulib/m4/getdtablesize.m4 \ + $(top_srcdir)/gnulib/m4/getline.m4 \ $(top_srcdir)/gnulib/m4/getlogin_r.m4 \ $(top_srcdir)/gnulib/m4/getopt.m4 \ $(top_srcdir)/gnulib/m4/gettext.m4 \ diff --git a/man/ru/Makefile.in b/man/ru/Makefile.in index a769ff07..6eb1d975 100644 --- a/man/ru/Makefile.in +++ b/man/ru/Makefile.in @@ -77,7 +77,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-bdb.m4 \ $(top_srcdir)/gnulib/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/gnulib/m4/getcwd-path-max.m4 \ $(top_srcdir)/gnulib/m4/getcwd.m4 \ + $(top_srcdir)/gnulib/m4/getdelim.m4 \ $(top_srcdir)/gnulib/m4/getdtablesize.m4 \ + $(top_srcdir)/gnulib/m4/getline.m4 \ $(top_srcdir)/gnulib/m4/getlogin_r.m4 \ $(top_srcdir)/gnulib/m4/getopt.m4 \ $(top_srcdir)/gnulib/m4/gettext.m4 \ diff --git a/manual/Makefile.in b/manual/Makefile.in index 4dfde321..8bc770e7 100644 --- a/manual/Makefile.in +++ b/manual/Makefile.in @@ -78,7 +78,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-bdb.m4 \ $(top_srcdir)/gnulib/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/gnulib/m4/getcwd-path-max.m4 \ $(top_srcdir)/gnulib/m4/getcwd.m4 \ + $(top_srcdir)/gnulib/m4/getdelim.m4 \ $(top_srcdir)/gnulib/m4/getdtablesize.m4 \ + $(top_srcdir)/gnulib/m4/getline.m4 \ $(top_srcdir)/gnulib/m4/getlogin_r.m4 \ $(top_srcdir)/gnulib/m4/getopt.m4 \ $(top_srcdir)/gnulib/m4/gettext.m4 \ diff --git a/src/Makefile.in b/src/Makefile.in index cc9c2238..9f56eecf 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -84,7 +84,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-bdb.m4 \ $(top_srcdir)/gnulib/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/gnulib/m4/getcwd-path-max.m4 \ $(top_srcdir)/gnulib/m4/getcwd.m4 \ + $(top_srcdir)/gnulib/m4/getdelim.m4 \ $(top_srcdir)/gnulib/m4/getdtablesize.m4 \ + $(top_srcdir)/gnulib/m4/getline.m4 \ $(top_srcdir)/gnulib/m4/getlogin_r.m4 \ $(top_srcdir)/gnulib/m4/getopt.m4 \ $(top_srcdir)/gnulib/m4/gettext.m4 \ diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in index 42417492..ec26d446 100644 --- a/src/tests/Makefile.in +++ b/src/tests/Makefile.in @@ -77,7 +77,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-bdb.m4 \ $(top_srcdir)/gnulib/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/gnulib/m4/getcwd-path-max.m4 \ $(top_srcdir)/gnulib/m4/getcwd.m4 \ + $(top_srcdir)/gnulib/m4/getdelim.m4 \ $(top_srcdir)/gnulib/m4/getdtablesize.m4 \ + $(top_srcdir)/gnulib/m4/getline.m4 \ $(top_srcdir)/gnulib/m4/getlogin_r.m4 \ $(top_srcdir)/gnulib/m4/getopt.m4 \ $(top_srcdir)/gnulib/m4/gettext.m4 \ diff --git a/tools/Makefile.in b/tools/Makefile.in index 922cc146..66b673e2 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -81,7 +81,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-bdb.m4 \ $(top_srcdir)/gnulib/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/gnulib/m4/getcwd-path-max.m4 \ $(top_srcdir)/gnulib/m4/getcwd.m4 \ + $(top_srcdir)/gnulib/m4/getdelim.m4 \ $(top_srcdir)/gnulib/m4/getdtablesize.m4 \ + $(top_srcdir)/gnulib/m4/getline.m4 \ $(top_srcdir)/gnulib/m4/getlogin_r.m4 \ $(top_srcdir)/gnulib/m4/getopt.m4 \ $(top_srcdir)/gnulib/m4/gettext.m4 \ -- cgit v1.2.3