X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsafe-read.c;h=0cb1edee8bc789ab6589d2cd93c7e265ce1a418a;hb=a0092d82930eaf9bcbdf1840b2133e24997d2311;hp=7fd4415bb2654b6b993838a1b8a02d3cc92ca806;hpb=5201e892c131789dfc7a2060c78a7d67edfb92ac;p=gnulib.git
diff --git a/lib/safe-read.c b/lib/safe-read.c
index 7fd4415bb..0cb1edee8 100644
--- a/lib/safe-read.c
+++ b/lib/safe-read.c
@@ -1,10 +1,12 @@
-/* safe-read.c -- an interface to read that retries after interrupts
- Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+/* An interface to read and write that retries after interrupts.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 1993, 1994, 1998, 2002, 2003, 2004, 2005, 2006 Free
+ Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, 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
@@ -12,54 +14,64 @@
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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
+ along with this program. If not, see . */
-#ifdef HAVE_CONFIG_H
#include
+
+/* Specification. */
+#ifdef SAFE_WRITE
+# include "safe-write.h"
+#else
+# include "safe-read.h"
#endif
+/* Get ssize_t. */
#include
-
-#ifdef HAVE_UNISTD_H
#include
-#endif
#include
-#ifndef STDC_HEADERS
-extern int errno;
+
+#ifdef EINTR
+# define IS_EINTR(x) ((x) == EINTR)
+#else
+# define IS_EINTR(x) 0
#endif
-/* Read LEN bytes at PTR from descriptor DESC, for file FILENAME,
- retrying if necessary. Return a negative value if an error occurs,
- otherwise return the actual number of bytes read,
- which must be LEN unless end-of-file was reached. */
+#include
- The canonical source for this function is in the gcc distribution
- in file cccp.c. So don't make any changes here. */
+#ifdef SAFE_WRITE
+# define safe_rw safe_write
+# define rw write
+#else
+# define safe_rw safe_read
+# define rw read
+# undef const
+# define const /* empty */
+#endif
-static int
-safe_read (desc, ptr, len)
- int desc;
- char *ptr;
- int len;
+/* Read(write) up to COUNT bytes at BUF from(to) descriptor FD, retrying if
+ interrupted. Return the actual number of bytes read(written), zero for EOF,
+ or SAFE_READ_ERROR(SAFE_WRITE_ERROR) upon error. */
+size_t
+safe_rw (int fd, void const *buf, size_t count)
{
- int left = len;
- while (left > 0) {
- int nchars = read (desc, ptr, left);
- if (nchars < 0)
- {
-#ifdef EINTR
- if (errno == EINTR)
- continue;
-#endif
- return nchars;
- }
- if (nchars == 0)
- break;
- ptr += nchars;
- left -= nchars;
- }
- return len - left;
+ /* Work around a bug in Tru64 5.1. Attempting to read more than
+ INT_MAX bytes fails with errno == EINVAL. See
+ .
+ When decreasing COUNT, keep it block-aligned. */
+ enum { BUGGY_READ_MAXIMUM = INT_MAX & ~8191 };
+
+ for (;;)
+ {
+ ssize_t result = rw (fd, buf, count);
+
+ 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;
+ }
}