X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffull-write.c;h=151370563780d939b77f4f35144575b259a2cfe1;hb=a76a349e949dfad5716eb3893052070b770e949f;hp=3fca56b0e303c95380ffc7858f6c3bfb854683d6;hpb=7f291f45e82dc8b2cbee5893188e474a4448c945;p=gnulib.git

diff --git a/lib/full-write.c b/lib/full-write.c
index 3fca56b0e..151370563 100644
--- a/lib/full-write.c
+++ b/lib/full-write.c
@@ -1,5 +1,6 @@
-/* safe-write.c -- an interface to write that retries after interrupts
-   Copyright (C) 1993 Free Software Foundation, Inc.
+/* An interface to read and write that retries (if necessary) until complete.
+
+   Copyright (C) 1993, 1994, 1997-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
@@ -12,56 +13,73 @@
    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.
-
-   Copied largely from GNU C's cccp.c.
-   */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
-#include <config.h>
-#else
-#include "config.h"
-#endif
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif
 
-#include <sys/types.h>
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+/* Specification.  */
+#ifdef FULL_READ
+# include "full-read.h"
+#else
+# include "full-write.h"
 #endif
 
 #include <errno.h>
-#ifndef STDC_HEADERS
+#ifndef errno
 extern int errno;
 #endif
 
-/* Write LEN bytes at PTR to descriptor DESC, retrying if interrupted.
-   Return zero upon success, write's (negative) error code otherwise.  */
+#ifdef FULL_READ
+# include "safe-read.h"
+# define safe_rw safe_read
+# define full_rw full_read
+# undef const
+# define const /* empty */
+#else
+# include "safe-write.h"
+# define safe_rw safe_write
+# define full_rw full_write
+#endif
+
+#ifdef FULL_READ
+/* Set errno to zero upon EOF.  */
+# define ZERO_BYTE_TRANSFER_ERRNO 0
+#else
+/* Some buggy drivers return 0 when one tries to write beyond
+   a device's end.  (Example: Linux 1.2.13 on /dev/fd0.)
+   Set errno to ENOSPC so they get a sensible diagnostic.  */
+# define ZERO_BYTE_TRANSFER_ERRNO ENOSPC
+#endif
 
-int
-safe_write (desc, ptr, len)
-     int desc;
-     char *ptr;
-     int len;
+/* Write(read) COUNT bytes at BUF to(from) descriptor FD, retrying if
+   interrupted or if a partial write(read) occurs.  Return the number
+   of bytes transferred.
+   When writing, set errno if fewer than COUNT bytes are written.
+   When reading, if fewer than COUNT bytes are read, you must examine
+   errno to distinguish failure from EOF (errno == 0).  */
+size_t
+full_rw (int fd, const void *buf, size_t count)
 {
-  while (len > 0)
+  size_t total = 0;
+  const char *ptr = buf;
+
+  while (count > 0)
     {
-      int written = write (desc, ptr, len);
-      if (written < 0)
+      size_t n_rw = safe_rw (fd, ptr, count);
+      if (n_rw == (size_t) -1)
+	break;
+      if (n_rw == 0)
 	{
-#ifdef EINTR
-	  if (errno == EINTR)
-	    continue;
-#endif
-	  return written;
+	  errno = ZERO_BYTE_TRANSFER_ERRNO;
+	  break;
 	}
-      ptr += written;
-      len -= written;
+      total += n_rw;
+      ptr += n_rw;
+      count -= n_rw;
     }
-  return 0;
+
+  return total;
 }