From: Jim Meyering <jim@meyering.net>
Date: Tue, 27 Feb 1996 03:24:31 +0000 (+0000)
Subject: (copy): Remove bogus (now that we're using full_write) increment of w_partial.
X-Git-Tag: FILEUTILS-3_12j~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edac0ff42083e2d42586caaca849cc5f7a260ede;p=thirdparty%2Fcoreutils.git

(copy): Remove bogus (now that we're using full_write) increment of w_partial.
Change sense of the tests (though they're equivalent) that check
the value returned by full_write. making it clearer where errno
is valid.  full_write always writes the full amount or fails.
---

diff --git a/src/dd.c b/src/dd.c
index 858d3e9641..f56e554461 100644
--- a/src/dd.c
+++ b/src/dd.c
@@ -611,11 +611,9 @@ copy (void)
       if (ibuf == obuf)		/* If not C_TWOBUFS. */
 	{
 	  int nwritten = full_write (output_fd, obuf, nread);
-	  if (nwritten != nread)
+	  if (nwritten < 0)
 	    {
 	      error (0, errno, "%s", output_file);
-	      if (nwritten > 0)
-		w_partial++;
 	      quit (1);
 	    }
 	  else if (nread == input_blocksize)
@@ -677,7 +675,7 @@ copy (void)
       int nwritten = full_write (output_fd, obuf, oc);
       if (nwritten > 0)
 	w_partial++;
-      if (nwritten != oc)
+      if (nwritten < 0)
 	{
 	  error (0, errno, "%s", output_file);
 	  quit (1);