From: Jim Meyering <jim@meyering.net>
Date: Mon, 23 Apr 2001 07:38:33 +0000 (+0000)
Subject: (dd_copy): When using sync with either block or unblock,
X-Git-Tag: FILEUTILS-4_0_45~1
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=cc3ea7c99f32fb0ab4a2164173f22bbf3ef9ee36;p=thirdparty%2Fcoreutils.git

(dd_copy): When using sync with either block or unblock,
pad with spaces.
---

diff --git a/src/dd.c b/src/dd.c
index a271fdce3f..b493accf4b 100644
--- a/src/dd.c
+++ b/src/dd.c
@@ -946,7 +946,7 @@ dd_copy (void)
     {
       /* FIXME: this loses for
 	 % ./dd if=dd seek=1 |:
-	 ./dd: standard output: Bad file number
+	 ./dd: standard output: Bad file descriptor
 	 0+0 records in
 	 0+0 records out
 	 */
@@ -966,7 +966,9 @@ dd_copy (void)
 	 whatever data we are able to read is followed by zeros.
 	 This minimizes data loss. */
       if ((conversions_mask & C_SYNC) && (conversions_mask & C_NOERROR))
-	memset ((char *) ibuf, 0, input_blocksize);
+	memset ((char *) ibuf,
+		(conversions_mask & (C_BLOCK | C_UNBLOCK)) ? ' ' : '\0',
+		input_blocksize);
 
       nread = safe_read (STDIN_FILENO, ibuf, input_blocksize);
 
@@ -1005,7 +1007,8 @@ dd_copy (void)
 	    {
 	      if (!(conversions_mask & C_NOERROR))
 		/* If C_NOERROR, we zeroed the block before reading. */
-		memset ((char *) (ibuf + n_bytes_read), 0,
+		memset ((char *) (ibuf + n_bytes_read),
+			(conversions_mask & (C_BLOCK | C_UNBLOCK)) ? ' ' : '\0',
 			input_blocksize - n_bytes_read);
 	      n_bytes_read = input_blocksize;
 	    }