bug-gnulib
[Top][All Lists]
Advanced

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

Re: [Bug-gnulib] getline bug?


From: Paul Eggert
Subject: Re: [Bug-gnulib] getline bug?
Date: Mon, 04 Oct 2004 13:23:11 -0700
User-agent: Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3 (gnu/linux)

Jim Meyering <address@hidden> writes:

> Simon's solution (of changing the default to be `don't use unlocked-io')
> is fine with me.

OK, I installed the following into gnulib, so that the change is done
systematically for all gnulib modules.  I also installed the
coreutils-relevant part of this patch into coreutils.  There are one
or two other coreutils-only changes but I'll note them only on
bug-coreutils.

2004-10-04  Paul Eggert  <address@hidden>

        * lib/argmatch.c, lib/closeout.c, lib/error.c, lib/exclude.c,
        lib/getdate.y, lib/getndelim2.c, lib/getpass.c,
        lib/getusershell.c, lib/linebuffer.c, md5.c, lib/mountlist.c,
        lib/posixtm.c, lib/readtokens.c, lib/readutmp.c, lib/regex.c,
        lib/sha1.c, lib/version-etc.c, lib/yesno.c: Include
        "unlocked-io.h" only if USE_UNLOCKED_IO.
        * lib/unlocked-io.h: Don't worry about USE_UNLOCKED_IO; that's now
        the includer's responsibility.

        * m4/unlocked-io.m4: Add copyright notice.
        (gl_FUNC_GLIBC_UNLOCKED_IO): Define USE_UNLOCKED_IO.
 
        * modules/argmatch, modules/argp, modules/closeout, modules/error,
        modules/exclude, modules/getdate, modules/getline,
        modules/getndelim2, modules/getpass, modules/getpass-gnu,
        modules/getusershell, modules/linebuffer, modules/md5,
        modules/mountlist, modules/posixtm, modules/readtokens,
        modules/readutmp, modules/regex, modules/sha1,
        modules/version-etc, modules/yesno:
        Remove dependency on unlocked-io.

Index: lib/argmatch.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/argmatch.c,v
retrieving revision 1.35
diff -p -u -r1.35 argmatch.c
--- lib/argmatch.c      4 Oct 2004 04:28:40 -0000       1.35
+++ lib/argmatch.c      4 Oct 2004 20:13:13 -0000
@@ -39,7 +39,10 @@
 #include "exit.h"
 #include "quotearg.h"
 #include "quote.h"
-#include "unlocked-io.h"
+
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
 
 /* When reporting an invalid argument, show nonprinting characters
    by using the quoting style ARGMATCH_QUOTING_STYLE.  Do not use
Index: lib/closeout.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/closeout.c,v
retrieving revision 1.13
diff -p -u -r1.13 closeout.c
--- lib/closeout.c      7 Aug 2004 00:09:38 -0000       1.13
+++ lib/closeout.c      4 Oct 2004 20:13:13 -0000
@@ -32,9 +32,12 @@
 #include "error.h"
 #include "exitfail.h"
 #include "quotearg.h"
-#include "unlocked-io.h"
 #include "__fpending.h"
 
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
+
 static const char *file_name;
 
 /* Set the file name to be reported in the event an error is detected
Index: lib/error.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/error.c,v
retrieving revision 1.39
diff -p -u -r1.39 error.c
--- lib/error.c 5 Aug 2004 23:39:18 -0000       1.39
+++ lib/error.c 4 Oct 2004 20:13:13 -0000
@@ -40,7 +40,7 @@
 # define mbsrtowcs __mbsrtowcs
 #endif
 
-#if !_LIBC
+#ifdef USE_UNLOCKED_IO
 # include "unlocked-io.h"
 #endif
 
Index: lib/exclude.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/exclude.c,v
retrieving revision 1.21
diff -p -u -r1.21 exclude.c
--- lib/exclude.c       7 Aug 2004 00:09:39 -0000       1.21
+++ lib/exclude.c       4 Oct 2004 20:13:13 -0000
@@ -35,9 +35,12 @@
 
 #include "exclude.h"
 #include "fnmatch.h"
-#include "unlocked-io.h"
 #include "xalloc.h"
 
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
+
 #if STDC_HEADERS || (! defined isascii && ! HAVE_ISASCII)
 # define IN_CTYPE_DOMAIN(c) true
 #else
Index: lib/getdate.y
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/getdate.y,v
retrieving revision 1.83
diff -p -u -r1.83 getdate.y
--- lib/getdate.y       7 Aug 2004 00:09:39 -0000       1.83
+++ lib/getdate.y       4 Oct 2004 20:13:13 -0000
@@ -77,7 +77,9 @@
 
 #include <string.h>
 
-#include "unlocked-io.h"
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
 
 #if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__
 # define __attribute__(x)
Index: lib/getndelim2.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/getndelim2.c,v
retrieving revision 1.8
diff -p -u -r1.8 getndelim2.c
--- lib/getndelim2.c    10 Jul 2004 07:58:10 -0000      1.8
+++ lib/getndelim2.c    4 Oct 2004 20:13:13 -0000
@@ -29,7 +29,9 @@
 #include <stdlib.h>
 #include <stddef.h>
 
-#include "unlocked-io.h"
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
 
 #include <limits.h>
 #if HAVE_INTTYPES_H
Index: lib/getpass.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/getpass.c,v
retrieving revision 1.7
diff -p -u -r1.7 getpass.c
--- lib/getpass.c       9 Aug 2004 23:54:10 -0000       1.7
+++ lib/getpass.c       4 Oct 2004 20:13:13 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992-2001, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1992-2001, 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
@@ -55,7 +55,7 @@
 #if _LIBC
 # define flockfile(s) _IO_flockfile (s)
 # define funlockfile(s) _IO_funlockfile (s)
-#else
+#elif USE_UNLOCKED_IO
 # include "unlocked-io.h"
 #endif
 
Index: lib/getusershell.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/getusershell.c,v
retrieving revision 1.18
diff -p -u -r1.18 getusershell.c
--- lib/getusershell.c  30 Oct 2003 00:36:03 -0000      1.18
+++ lib/getusershell.c  4 Oct 2004 20:13:13 -0000
@@ -1,5 +1,7 @@
 /* getusershell.c -- Return names of valid user shells.
-   Copyright (C) 1991, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
+
+   Copyright (C) 1991, 1997, 2000, 2001, 2003, 2004 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
@@ -34,9 +36,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include "unlocked-io.h"
+
 #include "xalloc.h"
 
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
+
 #if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
 # define IN_CTYPE_DOMAIN(c) 1
 #else
Index: lib/linebuffer.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/linebuffer.c,v
retrieving revision 1.18
diff -p -u -r1.18 linebuffer.c
--- lib/linebuffer.c    31 Oct 2003 13:53:15 -0000      1.18
+++ lib/linebuffer.c    4 Oct 2004 20:13:13 -0000
@@ -1,7 +1,7 @@
 /* linebuffer.c -- read arbitrarily long lines
 
-   Copyright (C) 1986, 1991, 1998, 1999, 2001, 2003 Free Software
-   Foundation, Inc.
+   Copyright (C) 1986, 1991, 1998, 1999, 2001, 2003, 2004 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
@@ -28,9 +28,12 @@
 #include <string.h>
 #include <sys/types.h>
 #include "linebuffer.h"
-#include "unlocked-io.h"
 #include "xalloc.h"
 
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
+
 /* Initialize linebuffer LINEBUFFER for use. */
 
 void
Index: lib/md5.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/md5.c,v
retrieving revision 1.16
diff -p -u -r1.16 md5.c
--- lib/md5.c   7 Aug 2004 00:09:39 -0000       1.16
+++ lib/md5.c   4 Oct 2004 20:13:13 -0000
@@ -29,7 +29,9 @@
 #include <stddef.h>
 #include <string.h>
 
-#include "unlocked-io.h"
+#ifdef USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
 
 #ifdef _LIBC
 # include <endian.h>
Index: lib/mountlist.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/mountlist.c,v
retrieving revision 1.46
diff -p -u -r1.46 mountlist.c
--- lib/mountlist.c     7 Aug 2004 00:09:39 -0000       1.46
+++ lib/mountlist.c     4 Oct 2004 20:13:13 -0000
@@ -134,7 +134,10 @@ char *strstr ();
 #endif
 
 #include "mountlist.h"
-#include "unlocked-io.h"
+
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
 
 #ifndef SIZE_MAX
 # define SIZE_MAX ((size_t) -1)
Index: lib/posixtm.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/posixtm.c,v
retrieving revision 1.17
diff -p -u -r1.17 posixtm.c
--- lib/posixtm.c       7 Aug 2004 00:09:39 -0000       1.17
+++ lib/posixtm.c       4 Oct 2004 20:13:13 -0000
@@ -38,7 +38,10 @@
 #endif
 
 #include "posixtm.h"
-#include "unlocked-io.h"
+
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
 
 /* ISDIGIT differs from isdigit, as follows:
    - Its arg may be any int or unsigned int; it need not be an unsigned char.
Index: lib/readtokens.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/readtokens.c,v
retrieving revision 1.14
diff -p -u -r1.14 readtokens.c
--- lib/readtokens.c    7 Aug 2004 00:09:39 -0000       1.14
+++ lib/readtokens.c    4 Oct 2004 20:13:13 -0000
@@ -32,9 +32,12 @@
 #include <string.h>
 #include <stdbool.h>
 
-#include "unlocked-io.h"
 #include "xalloc.h"
 
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
+
 #define STREQ(a,b) ((a) == (b) || ((a) && (b) && *(a) == *(b) \
                                   && strcmp(a, b) == 0))
 
Index: lib/readutmp.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/readutmp.c,v
retrieving revision 1.17
diff -p -u -r1.17 readutmp.c
--- lib/readutmp.c      7 Aug 2004 00:09:39 -0000       1.17
+++ lib/readutmp.c      4 Oct 2004 20:13:13 -0000
@@ -27,9 +27,12 @@
 #include <stdlib.h>
 
 #include "readutmp.h"
-#include "unlocked-io.h"
 #include "xalloc.h"
 
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
+
 /* Copy UT->ut_name into storage obtained from malloc.  Then remove any
    trailing spaces from the copy, NUL terminate it, and return the copy.  */
 
Index: lib/regex.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/regex.c,v
retrieving revision 1.81
diff -p -u -r1.81 regex.c
--- lib/regex.c 17 May 2004 05:41:42 -0000      1.81
+++ lib/regex.c 4 Oct 2004 20:13:14 -0000
@@ -583,7 +583,10 @@ typedef enum
 #  undef INSIDE_RECURSION
 # endif
 #endif
-#include "unlocked-io.h"
+
+#ifdef USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
 
 #ifdef INSIDE_RECURSION
 /* Common operations on the compiled pattern.  */
Index: lib/sha1.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/sha1.c,v
retrieving revision 1.1
diff -p -u -r1.1 sha1.c
--- lib/sha1.c  9 Aug 2004 17:58:47 -0000       1.1
+++ lib/sha1.c  4 Oct 2004 20:13:14 -0000
@@ -31,7 +31,9 @@
 #include <stddef.h>
 #include <string.h>
 
-#include "unlocked-io.h"
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
 
 /*
   Not-swap is a macro that does an endian swap on architectures that are
Index: lib/unlocked-io.h
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/unlocked-io.h,v
retrieving revision 1.4
diff -p -u -r1.4 unlocked-io.h
--- lib/unlocked-io.h   16 Jan 2004 09:59:18 -0000      1.4
+++ lib/unlocked-io.h   4 Oct 2004 20:13:14 -0000
@@ -1,6 +1,6 @@
 /* Prefer faster, non-thread-safe stdio functions if available.
 
-   Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004 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
@@ -19,13 +19,7 @@
 /* Written by Jim Meyering.  */
 
 #ifndef UNLOCKED_IO_H
-# define UNLOCKED_IO_H 1
-
-# ifndef USE_UNLOCKED_IO
-#  define USE_UNLOCKED_IO 1
-# endif
-
-# if USE_UNLOCKED_IO
+#define UNLOCKED_IO_H 1
 
 /* These are wrappers for functions/macros from the GNU C library, and
    from other C libraries supporting POSIX's optional thread-safe functions.
@@ -38,95 +32,106 @@
    the *_unlocked functions directly.  On hosts that lack those
    functions, invoke the non-thread-safe versions instead.  */
 
-#  include <stdio.h>
+#include <stdio.h>
+
+#if HAVE_DECL_CLEARERR_UNLOCKED
+# undef clearerr
+# define clearerr(x) clearerr_unlocked (x)
+#else
+# define clearerr_unlocked(x) clearerr (x)
+#endif
+
+#if HAVE_DECL_FEOF_UNLOCKED
+# undef feof
+# define feof(x) feof_unlocked (x)
+#else
+# define feof_unlocked(x) feof (x)
+#endif
+
+#if HAVE_DECL_FERROR_UNLOCKED
+# undef ferror
+# define ferror(x) ferror_unlocked (x)
+#else
+# define ferror_unlocked(x) ferror (x)
+#endif
+
+#if HAVE_DECL_FFLUSH_UNLOCKED
+# undef fflush
+# define fflush(x) fflush_unlocked (x)
+#else
+# define fflush_unlocked(x) fflush (x)
+#endif
+
+#if HAVE_DECL_FGETS_UNLOCKED
+# undef fgets
+# define fgets(x,y,z) fgets_unlocked (x,y,z)
+#else
+# define fgets_unlocked(x,y,z) fgets (x,y,z)
+#endif
+
+#if HAVE_DECL_FPUTC_UNLOCKED
+# undef fputc
+# define fputc(x,y) fputc_unlocked (x,y)
+#else
+# define fputc_unlocked(x,y) fputc (x,y)
+#endif
+
+#if HAVE_DECL_FPUTS_UNLOCKED
+# undef fputs
+# define fputs(x,y) fputs_unlocked (x,y)
+#else
+# define fputs_unlocked(x,y) fputs (x,y)
+#endif
+
+#if HAVE_DECL_FREAD_UNLOCKED
+# undef fread
+# define fread(w,x,y,z) fread_unlocked (w,x,y,z)
+#else
+# define fread_unlocked(w,x,y,z) fread (w,x,y,z)
+#endif
+
+#if HAVE_DECL_FWRITE_UNLOCKED
+# undef fwrite
+# define fwrite(w,x,y,z) fwrite_unlocked (w,x,y,z)
+#else
+# define fwrite_unlocked(w,x,y,z) fwrite (w,x,y,z)
+#endif
+
+#if HAVE_DECL_GETC_UNLOCKED
+# undef getc
+# define getc(x) getc_unlocked (x)
+#else
+# define getc_unlocked(x) getc (x)
+#endif
+
+#if HAVE_DECL_GETCHAR_UNLOCKED
+# undef getchar
+# define getchar() getchar_unlocked ()
+#else
+# define getchar_unlocked() getchar ()
+#endif
+
+#if HAVE_DECL_PUTC_UNLOCKED
+# undef putc
+# define putc(x,y) putc_unlocked (x,y)
+#else
+# define putc_unlocked(x,y) putc (x,y)
+#endif
+
+#if HAVE_DECL_PUTCHAR_UNLOCKED
+# undef putchar
+# define putchar(x) putchar_unlocked (x)
+#else
+# define putchar_unlocked(x) putchar (x)
+#endif
 
-#  if HAVE_DECL_CLEARERR_UNLOCKED
-#   undef clearerr
-#   define clearerr(x) clearerr_unlocked (x)
-#  else
-#   define clearerr_unlocked(x) clearerr (x)
-#  endif
-#  if HAVE_DECL_FEOF_UNLOCKED
-#   undef feof
-#   define feof(x) feof_unlocked (x)
-#  else
-#   define feof_unlocked(x) feof (x)
-#  endif
-#  if HAVE_DECL_FERROR_UNLOCKED
-#   undef ferror
-#   define ferror(x) ferror_unlocked (x)
-#  else
-#   define ferror_unlocked(x) ferror (x)
-#  endif
-#  if HAVE_DECL_FFLUSH_UNLOCKED
-#   undef fflush
-#   define fflush(x) fflush_unlocked (x)
-#  else
-#   define fflush_unlocked(x) fflush (x)
-#  endif
-#  if HAVE_DECL_FGETS_UNLOCKED
-#   undef fgets
-#   define fgets(x,y,z) fgets_unlocked (x,y,z)
-#  else
-#   define fgets_unlocked(x,y,z) fgets (x,y,z)
-#  endif
-#  if HAVE_DECL_FPUTC_UNLOCKED
-#   undef fputc
-#   define fputc(x,y) fputc_unlocked (x,y)
-#  else
-#   define fputc_unlocked(x,y) fputc (x,y)
-#  endif
-#  if HAVE_DECL_FPUTS_UNLOCKED
-#   undef fputs
-#   define fputs(x,y) fputs_unlocked (x,y)
-#  else
-#   define fputs_unlocked(x,y) fputs (x,y)
-#  endif
-#  if HAVE_DECL_FREAD_UNLOCKED
-#   undef fread
-#   define fread(w,x,y,z) fread_unlocked (w,x,y,z)
-#  else
-#   define fread_unlocked(w,x,y,z) fread (w,x,y,z)
-#  endif
-#  if HAVE_DECL_FWRITE_UNLOCKED
-#   undef fwrite
-#   define fwrite(w,x,y,z) fwrite_unlocked (w,x,y,z)
-#  else
-#   define fwrite_unlocked(w,x,y,z) fwrite (w,x,y,z)
-#  endif
-#  if HAVE_DECL_GETC_UNLOCKED
-#   undef getc
-#   define getc(x) getc_unlocked (x)
-#  else
-#   define getc_unlocked(x) getc (x)
-#  endif
-#  if HAVE_DECL_GETCHAR_UNLOCKED
-#   undef getchar
-#   define getchar() getchar_unlocked ()
-#  else
-#   define getchar_unlocked() getchar ()
-#  endif
-#  if HAVE_DECL_PUTC_UNLOCKED
-#   undef putc
-#   define putc(x,y) putc_unlocked (x,y)
-#  else
-#   define putc_unlocked(x,y) putc (x,y)
-#  endif
-#  if HAVE_DECL_PUTCHAR_UNLOCKED
-#   undef putchar
-#   define putchar(x) putchar_unlocked (x)
-#  else
-#   define putchar_unlocked(x) putchar (x)
-#  endif
-
-#  undef flockfile
-#  define flockfile(x) ((void) 0)
+#undef flockfile
+#define flockfile(x) ((void) 0)
 
-#  undef ftrylockfile
-#  define ftrylockfile(x) 0
+#undef ftrylockfile
+#define ftrylockfile(x) 0
 
-#  undef funlockfile
-#  define funlockfile(x) ((void) 0)
+#undef funlockfile
+#define funlockfile(x) ((void) 0)
 
-# endif /* USE_UNLOCKED_IO */
 #endif /* UNLOCKED_IO_H */
Index: lib/version-etc.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/version-etc.c,v
retrieving revision 1.15
diff -p -u -r1.15 version-etc.c
--- lib/version-etc.c   7 Aug 2004 00:09:39 -0000       1.15
+++ lib/version-etc.c   4 Oct 2004 20:13:14 -0000
@@ -27,7 +27,10 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "unlocked-io.h"
+
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
Index: lib/yesno.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/yesno.c,v
retrieving revision 1.11
diff -p -u -r1.11 yesno.c
--- lib/yesno.c 6 Aug 2004 22:55:45 -0000       1.11
+++ lib/yesno.c 4 Oct 2004 20:13:14 -0000
@@ -24,7 +24,10 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "unlocked-io.h"
+
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
 
 /* Read one line from standard input
    and return nonzero if that line begins with y or Y,
Index: m4/unlocked-io.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/unlocked-io.m4,v
retrieving revision 1.3
diff -p -u -r1.3 unlocked-io.m4
--- m4/unlocked-io.m4   18 Apr 2004 18:12:50 -0000      1.3
+++ m4/unlocked-io.m4   4 Oct 2004 20:15:27 -0000
@@ -1,4 +1,21 @@
-#serial 9
+# unlocked-io.m4 serial 10
+
+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 dnl From Jim Meyering.
 dnl
@@ -10,6 +27,11 @@ dnl on Solaris 2.6).
 
 AC_DEFUN([gl_FUNC_GLIBC_UNLOCKED_IO],
 [
+  AC_DEFINE([USE_UNLOCKED_IO], 1,
+    [Define to 1 if you want getc etc. to use unlocked I/O if available.
+     Unlocked I/O can improve performance in unithreaded apps,
+     but it is not safe for multithreaded apps.])
+
   dnl Persuade glibc and Solaris <stdio.h> to declare
   dnl fgets_unlocked(), fputs_unlocked() etc.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
Index: modules/argmatch
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/argmatch,v
retrieving revision 1.7
diff -p -u -r1.7 argmatch
--- modules/argmatch    22 Sep 2004 15:11:04 -0000      1.7
+++ modules/argmatch    4 Oct 2004 20:15:27 -0000
@@ -10,7 +10,6 @@ gettext
 error
 quotearg
 quote
-unlocked-io
 exit
 exitfail
 
Index: modules/argp
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/argp,v
retrieving revision 1.8
diff -p -u -r1.8 argp
--- modules/argp        30 Sep 2004 16:40:59 -0000      1.8
+++ modules/argp        4 Oct 2004 20:15:39 -0000
@@ -15,7 +15,6 @@ lib/argp-pv.c
 lib/argp-pvh.c
 lib/argp-xinl.c
 m4/argp.m4
-m4/unlocked-io.m4
 
 Depends-on:
 alloca
Index: modules/closeout
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/closeout,v
retrieving revision 1.5
diff -p -u -r1.5 closeout
--- modules/closeout    22 Sep 2004 15:11:04 -0000      1.5
+++ modules/closeout    4 Oct 2004 20:15:39 -0000
@@ -7,7 +7,6 @@ lib/closeout.c
 m4/closeout.m4
 
 Depends-on:
-unlocked-io
 gettext
 error
 quotearg
Index: modules/error
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/error,v
retrieving revision 1.5
diff -p -u -r1.5 error
--- modules/error       22 Sep 2004 15:11:04 -0000      1.5
+++ modules/error       4 Oct 2004 20:15:39 -0000
@@ -8,7 +8,6 @@ m4/error.m4
 m4/strerror_r.m4
 
 Depends-on:
-unlocked-io
 gettext
 
 configure.ac:
Index: modules/exclude
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/exclude,v
retrieving revision 1.4
diff -p -u -r1.4 exclude
--- modules/exclude     22 Sep 2004 15:11:04 -0000      1.4
+++ modules/exclude     4 Oct 2004 20:15:39 -0000
@@ -9,7 +9,6 @@ m4/exclude.m4
 Depends-on:
 xalloc
 strcase
-unlocked-io
 fnmatch-gnu
 stdbool
 
Index: modules/getdate
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/getdate,v
retrieving revision 1.7
diff -p -u -r1.7 getdate
--- modules/getdate     22 Sep 2004 15:11:04 -0000      1.7
+++ modules/getdate     4 Oct 2004 20:15:39 -0000
@@ -14,7 +14,6 @@ stdbool
 gettime
 mktime
 alloca
-unlocked-io
 
 configure.ac:
 gl_GETDATE
Index: modules/getline
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/getline,v
retrieving revision 1.7
diff -p -u -r1.7 getline
--- modules/getline     22 Sep 2004 15:11:04 -0000      1.7
+++ modules/getline     4 Oct 2004 20:15:51 -0000
@@ -11,7 +11,6 @@ m4/getndelim2.m4
 m4/ssize_t.m4
 
 Depends-on:
-unlocked-io
 
 configure.ac:
 AM_FUNC_GETLINE
Index: modules/getndelim2
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/getndelim2,v
retrieving revision 1.3
diff -p -u -r1.3 getndelim2
--- modules/getndelim2  22 Sep 2004 15:11:04 -0000      1.3
+++ modules/getndelim2  4 Oct 2004 20:15:51 -0000
@@ -9,7 +9,6 @@ m4/getndelim2.m4
 m4/ssize_t.m4
 
 Depends-on:
-unlocked-io
 
 configure.ac:
 gl_GETNDELIM2
Index: modules/getpass
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/getpass,v
retrieving revision 1.6
diff -p -u -r1.6 getpass
--- modules/getpass     22 Sep 2004 15:11:04 -0000      1.6
+++ modules/getpass     4 Oct 2004 20:15:51 -0000
@@ -7,7 +7,6 @@ lib/getpass.c
 m4/getpass.m4
 
 Depends-on:
-unlocked-io
 getline
 stdbool
 
Index: modules/getpass-gnu
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/getpass-gnu,v
retrieving revision 1.3
diff -p -u -r1.3 getpass-gnu
--- modules/getpass-gnu 22 Sep 2004 15:11:04 -0000      1.3
+++ modules/getpass-gnu 4 Oct 2004 20:15:51 -0000
@@ -7,7 +7,6 @@ lib/getpass.c
 m4/getpass.m4
 
 Depends-on:
-unlocked-io
 getline
 stdbool
 
Index: modules/getusershell
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/getusershell,v
retrieving revision 1.4
diff -p -u -r1.4 getusershell
--- modules/getusershell        22 Sep 2004 15:11:04 -0000      1.4
+++ modules/getusershell        4 Oct 2004 20:15:51 -0000
@@ -7,7 +7,6 @@ m4/getusershell.m4
 
 Depends-on:
 xalloc
-unlocked-io
 
 configure.ac:
 gl_PREREQ_GETUSERSHELL
Index: modules/linebuffer
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/linebuffer,v
retrieving revision 1.4
diff -p -u -r1.4 linebuffer
--- modules/linebuffer  22 Sep 2004 15:11:04 -0000      1.4
+++ modules/linebuffer  4 Oct 2004 20:15:51 -0000
@@ -7,7 +7,6 @@ lib/linebuffer.c
 
 Depends-on:
 xalloc
-unlocked-io
 
 configure.ac:
 
Index: modules/md5
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/md5,v
retrieving revision 1.6
diff -p -u -r1.6 md5
--- modules/md5 22 Sep 2004 15:11:04 -0000      1.6
+++ modules/md5 4 Oct 2004 20:15:51 -0000
@@ -8,7 +8,6 @@ m4/md5.m4
 m4/uint32_t.m4
 
 Depends-on:
-unlocked-io
 
 configure.ac:
 gl_MD5
Index: modules/mountlist
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/mountlist,v
retrieving revision 1.4
diff -p -u -r1.4 mountlist
--- modules/mountlist   22 Sep 2004 15:11:04 -0000      1.4
+++ modules/mountlist   4 Oct 2004 20:16:03 -0000
@@ -10,7 +10,6 @@ m4/mountlist.m4
 
 Depends-on:
 xalloc
-unlocked-io
 
 configure.ac:
 gl_MOUNTLIST
Index: modules/posixtm
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/posixtm,v
retrieving revision 1.5
diff -p -u -r1.5 posixtm
--- modules/posixtm     22 Sep 2004 15:11:04 -0000      1.5
+++ modules/posixtm     4 Oct 2004 20:16:03 -0000
@@ -8,7 +8,6 @@ m4/posixtm.m4
 
 Depends-on:
 mktime
-unlocked-io
 
 configure.ac:
 gl_POSIXTM
Index: modules/readtokens
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/readtokens,v
retrieving revision 1.4
diff -p -u -r1.4 readtokens
--- modules/readtokens  22 Sep 2004 15:11:04 -0000      1.4
+++ modules/readtokens  4 Oct 2004 20:16:03 -0000
@@ -8,7 +8,6 @@ m4/readtokens.m4
 
 Depends-on:
 xalloc
-unlocked-io
 
 configure.ac:
 gl_READTOKENS
Index: modules/readutmp
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/readutmp,v
retrieving revision 1.4
diff -p -u -r1.4 readutmp
--- modules/readutmp    22 Sep 2004 15:11:04 -0000      1.4
+++ modules/readutmp    4 Oct 2004 20:16:03 -0000
@@ -8,7 +8,6 @@ m4/readutmp.m4
 
 Depends-on:
 xalloc
-unlocked-io
 
 configure.ac:
 gl_READUTMP
Index: modules/regex
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/regex,v
retrieving revision 1.5
diff -p -u -r1.5 regex
--- modules/regex       22 Sep 2004 15:11:04 -0000      1.5
+++ modules/regex       4 Oct 2004 20:16:03 -0000
@@ -8,7 +8,6 @@ m4/regex.m4
 
 Depends-on:
 alloca
-unlocked-io
 gettext
 restrict
 
Index: modules/sha1
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/sha1,v
retrieving revision 1.2
diff -p -u -r1.2 sha1
--- modules/sha1        22 Sep 2004 15:11:04 -0000      1.2
+++ modules/sha1        4 Oct 2004 20:16:03 -0000
@@ -7,7 +7,6 @@ lib/sha1.c
 m4/sha1.m4
 
 Depends-on:
-unlocked-io
 md5
 
 configure.ac:
Index: modules/version-etc
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/version-etc,v
retrieving revision 1.4
diff -p -u -r1.4 version-etc
--- modules/version-etc 22 Sep 2004 15:11:04 -0000      1.4
+++ modules/version-etc 4 Oct 2004 20:16:10 -0000
@@ -6,7 +6,6 @@ lib/version-etc.h
 lib/version-etc.c
 
 Depends-on:
-unlocked-io
 gettext
 
 configure.ac:
Index: modules/yesno
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/yesno,v
retrieving revision 1.6
diff -p -u -r1.6 yesno
--- modules/yesno       22 Sep 2004 15:11:04 -0000      1.6
+++ modules/yesno       4 Oct 2004 20:16:10 -0000
@@ -8,7 +8,6 @@ lib/yesno.h
 m4/yesno.m4
 
 Depends-on:
-unlocked-io
 rpmatch
 
 configure.ac:




reply via email to

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