From: Jim Meyering <jim@meyering.net>
Date: Sat, 11 Nov 1995 22:08:16 +0000 (+0000)
Subject: (skip): Cast fseek's offset argument to `long'.
X-Git-Tag: TEXTUTILS-1_13F~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=849a1c46cfa48ebaf4339a5a5b7f2ec9ddce5fb9;p=thirdparty%2Fcoreutils.git

(skip): Cast fseek's offset argument to `long'.
Erik Bennett <bennett@cvo.oneworld.com> reported that this is
necessary on BSDI systems.  And if offset doesn't fit in a long,
then try using lseek instead.
---

diff --git a/src/od.c b/src/od.c
index 559626a196..0293b11a17 100644
--- a/src/od.c
+++ b/src/od.c
@@ -981,7 +981,13 @@ skip (off_t n_skip)
 	    }
 	  else
 	    {
-	      if (fseek (in_stream, n_skip, SEEK_SET) == 0)
+	      /* fseek may work on some streams for which lseek doesn't.
+		 But fseek's offset argument is restricted to the range
+		 of type `long'.  So if N_SKIP is too large or if fseek
+		 fails, try lseek.  */
+	      if ((n_skip <= LONG_MAX
+		   && fseek (in_stream, (long) n_skip, SEEK_SET) == 0)
+		  || lseek (fileno (in_stream), n_skip, SEEK_SET) >= 0)
 		{
 		  n_skip = 0;
 		  break;
@@ -989,7 +995,8 @@ skip (off_t n_skip)
 	    }
 	}
 
-      /* fseek didn't work or wasn't attempted; do it the slow way.  */
+      /* Seek didn't work or wasn't attempted;  position the file pointer
+	 by reading.  */
 
       for (j = n_skip / BUFSIZ; j >= 0; j--)
 	{