X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsafe-read.c;h=c21d1cf194004aa02ca07673d8d89d1f9add95c7;hb=fc66900ee825390c11719d7d3e6816c6fa94ef45;hp=e404586c75fe9b31c2153473111606d8d04d7fd1;hpb=89f2b4892655a929a506eff123c9126a88e2c8eb;p=gnulib.git

diff --git a/lib/safe-read.c b/lib/safe-read.c
index e404586c7..c21d1cf19 100644
--- a/lib/safe-read.c
+++ b/lib/safe-read.c
@@ -1,5 +1,5 @@
-/* safe-read.c -- an interface to read that retries after interrupts
-   Copyright (C) 1993, 1994, 1998 Free Software Foundation, Inc.
+/* An interface to read and write that retries after interrupts.
+   Copyright (C) 1993, 1994, 1998, 2002-2003 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
@@ -13,15 +13,21 @@
 
    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.
-   */
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
 #endif
 
-#include <sys/types.h>
+/* Specification.  */
+#ifdef SAFE_WRITE
+# include "safe-write.h"
+#else
+# include "safe-read.h"
+#endif
 
+/* Get ssize_t.  */
+#include <sys/types.h>
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
@@ -31,29 +37,46 @@
 extern int errno;
 #endif
 
-#include "safe-read.h"
+#ifdef EINTR
+# define IS_EINTR(x) ((x) == EINTR)
+#else
+# define IS_EINTR(x) 0
+#endif
 
-/* Read LEN bytes at PTR from descriptor DESC, retrying if interrupted.
-   Return the actual number of bytes read, zero for EOF, or negative
-   for an error.  */
+#include <limits.h>
 
-ssize_t
-safe_read (int desc, void *ptr, size_t len)
+#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
+
+/* 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)
 {
-  ssize_t n_chars;
+  ssize_t result;
 
-  if (len <= 0)
-    return len;
+  /* 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;
 
-#ifdef EINTR
   do
     {
-      n_chars = read (desc, ptr, len);
+      result = rw (fd, buf, count);
     }
-  while (n_chars < 0 && errno == EINTR);
-#else
-  n_chars = read (desc, ptr, len);
-#endif
+  while (result < 0 && IS_EINTR (errno));
 
-  return n_chars;
+  return (size_t) result;
 }