X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=lib%2Ffull-write.c;h=151370563780d939b77f4f35144575b259a2cfe1;hb=1ffb4377a444fb7150030acfe843bc20cfba5d5a;hp=062f2b2c6cb7ea2e1b93dbe26434cb04db7e5d2c;hpb=22954a6f8a13334f556cba68baf8276a94cbe5bc;p=chaz%2Ftar

diff --git a/lib/full-write.c b/lib/full-write.c
index 062f2b2..1513705 100644
--- a/lib/full-write.c
+++ b/lib/full-write.c
@@ -1,5 +1,6 @@
-/* full-write.c -- an interface to write that retries after interrupts
-   Copyright (C) 1993, 1994, 1997, 1998, 1999 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
@@ -13,19 +14,17 @@
 
    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.
-
-   Copied largely from GNU C's cccp.c.
-   */
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
 #endif
 
-#include <sys/types.h>
-
-#if HAVE_UNISTD_H
-# include <unistd.h>
+/* Specification.  */
+#ifdef FULL_READ
+# include "full-read.h"
+#else
+# include "full-write.h"
 #endif
 
 #include <errno.h>
@@ -33,32 +32,54 @@
 extern int errno;
 #endif
 
-/* Write LEN bytes at PTR to descriptor DESC, retrying if interrupted.
-   Return LEN 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
 
-ssize_t
-full_write (int desc, const char *ptr, size_t 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)
 {
-  ssize_t total_written = 0;
+  size_t total = 0;
+  const char *ptr = buf;
 
-  while (len > 0)
+  while (count > 0)
     {
-      ssize_t written = write (desc, ptr, len);
-      /* FIXME: write on my slackware Linux 1.2.13 returns zero when
-	 I try to write more data than there is room on a floppy disk.
-	 This puts dd into an infinite loop.  Reproduce with
-	 dd if=/dev/zero of=/dev/fd0.  */
-      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;
 	}
-      total_written += written;
-      ptr += written;
-      len -= written;
+      total += n_rw;
+      ptr += n_rw;
+      count -= n_rw;
     }
-  return total_written;
+
+  return total;
 }