X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=lib%2Ffull-write.c;h=4e566f6e25f6c066522ad6dca85dc585cf31113a;hb=efc9c76cb740c31e7388c022cdfccc0949da3240;hp=d81346c2881fab9f0a750b51aa9e4417d58c9eeb;hpb=65fda730cf28f12554f5e12ddd156aeceea41933;p=chaz%2Ftar

diff --git a/lib/full-write.c b/lib/full-write.c
index d81346c..4e566f6 100644
--- a/lib/full-write.c
+++ b/lib/full-write.c
@@ -1,5 +1,7 @@
 /* full-write.c -- an interface to write that retries after interrupts
-   Copyright (C) 1993, 1994, 1997, 1998, 1999 Free Software Foundation, Inc.
+
+   Copyright 1993, 1994, 1997, 1998, 1999, 2000, 2001 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
@@ -15,8 +17,7 @@
    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.
-   */
+   Written by Paul Eggert.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
@@ -24,7 +25,7 @@
 
 #include <sys/types.h>
 
-#include "safe-read.h"
+#include "full-write.h"
 
 #if HAVE_UNISTD_H
 # include <unistd.h>
@@ -35,28 +36,28 @@
 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.  */
+/* Write LEN bytes at PTR to descriptor DESC, retrying if interrupted
+   or if partial writes occur.  Return the number of bytes successfully
+   written, setting errno if that is less than LEN.  */
 
-ssize_t
+size_t
 full_write (int desc, const char *ptr, size_t len)
 {
-  ssize_t total_written = 0;
+  size_t total_written = 0;
 
   while (len > 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)
+      if (written <= 0)
 	{
+	  /* Some buggy drivers return 0 when you fall off a device's end.  */
+	  if (written == 0)
+	    errno = ENOSPC;
 #ifdef EINTR
 	  if (errno == EINTR)
 	    continue;
 #endif
-	  return written;
+	  break;
 	}
       total_written += written;
       ptr += written;