From: Jim Meyering <jim@meyering.net>
Date: Sat, 2 Dec 2000 08:19:21 +0000 (+0000)
Subject: (skip, dd_copy): Use ssize_t to store result of
X-Git-Tag: TEXTUTILS-2_0_9~53
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=acca4638b8c6956320520da77e54efcc64120740;p=thirdparty%2Fcoreutils.git

(skip, dd_copy): Use ssize_t to store result of
safe_read, to avoid overflow e.g. on 64-bit Solaris sparc.
(dd_copy): Remove unnecessary cast.
---

diff --git a/src/dd.c b/src/dd.c
index 6a1ad79209..580de46eb7 100644
--- a/src/dd.c
+++ b/src/dd.c
@@ -775,7 +775,7 @@ skip (int fdesc, char *file, uintmax_t records, size_t blocksize,
     {
       while (records--)
 	{
-	  int nread = safe_read (fdesc, buf, blocksize);
+	  ssize_t nread = safe_read (fdesc, buf, blocksize);
 	  if (nread < 0)
 	    {
 	      error (0, errno, _("reading %s"), quote (file));
@@ -892,7 +892,7 @@ dd_copy (void)
   unsigned char *ibuf, *bufstart; /* Input buffer. */
   unsigned char *real_buf;	  /* real buffer address before alignment */
   unsigned char *real_obuf;
-  int nread;			/* Bytes read in the current block. */
+  ssize_t nread;		/* Bytes read in the current block. */
   int exit_status = 0;
   size_t page_size = getpagesize ();
   size_t n_bytes_read;
@@ -991,7 +991,7 @@ dd_copy (void)
 	    }
 	}
 
-      n_bytes_read = (size_t) nread;
+      n_bytes_read = nread;
 
       if (n_bytes_read < input_blocksize)
 	{