Update 'safe-read' module from gnulib.

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index 8e991c8222259e8028d974016c9d215461ce05e4..11b9445030f295fe63b6671163f62aa12c932f07 100644 (file)
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -90,6 +90,10 @@
        * unlocked-io.h: Don't worry about USE_UNLOCKED_IO; that's now
        the includer's responsibility.
 
+2004-08-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * safe-read.c: Import changes from coreutils.
+
 2004-08-06  Paul Eggert  <eggert@cs.ucla.edu>
 
        * quotearg.c, quotearg.h: Import changes from coreutils.

diff --git a/gettext-tools/lib/safe-read.c b/gettext-tools/lib/safe-read.c
index c21d1cf194004aa02ca07673d8d89d1f9add95c7..6f8bd780ed01a25da8452bb0b77a95eb302fbbc6 100644 (file)
--- a/gettext-tools/lib/safe-read.c
+++ b/gettext-tools/lib/safe-read.c
@@ -1,5 +1,7 @@
 /* An interface to read and write that retries after interrupts.
-   Copyright (C) 1993, 1994, 1998, 2002-2003 Free Software Foundation, Inc.
+
+   Copyright (C) 1993, 1994, 1998, 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
@@ -33,9 +35,6 @@
 #endif
 
 #include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
 
 #ifdef EINTR
 # define IS_EINTR(x) ((x) == EINTR)
@@ -61,22 +60,23 @@ extern int errno;
 size_t
 safe_rw (int fd, void const *buf, size_t count)
 {
-  ssize_t result;
-
-  /* POSIX limits COUNT to SSIZE_MAX, but we limit it further, requiring
-     that COUNT <= INT_MAX, to avoid triggering a bug in Tru64 5.1.
-     When decreasing COUNT, keep the file pointer block-aligned.
-     Note that in any case, read(write) may succeed, yet read(write)
-     fewer than COUNT bytes, so the caller must be prepared to handle
-     partial results.  */
-  if (count > INT_MAX)
-    count = INT_MAX & ~8191;
+  /* Work around a bug in Tru64 5.1.  Attempting to read more than
+     INT_MAX bytes fails with errno == EINVAL.  See
+     <http://lists.gnu.org/archive/html/bug-gnu-utils/2002-04/msg00010.html>.
+     When decreasing COUNT, keep it block-aligned.  */
+  enum { BUGGY_READ_MAXIMUM = INT_MAX & ~8191 };
 
-  do
+  for (;;)
     {
-      result = rw (fd, buf, count);
-    }
-  while (result < 0 && IS_EINTR (errno));
+      ssize_t result = rw (fd, buf, count);
 
-  return (size_t) result;
+      if (0 <= result)
+       return result;
+      else if (IS_EINTR (errno))
+       continue;
+      else if (errno == EINVAL && BUGGY_READ_MAXIMUM < count)
+       count = BUGGY_READ_MAXIMUM;
+      else
+       return result;
+    }
 }