FileInputStream.java (skip): Call fd.getFilePointer() and calculate correct number...

	* java/io/FileInputStream.java (skip): Call fd.getFilePointer() and
	calculate correct number of bytes skipped.

From-SVN: r51293

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 322b39afa2265b3b28f817da9b048633190117f0..0b15ae640a6a6e7567be9592ee359419113d19ee 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -2,6 +2,9 @@
 
        * java/io/PushbackReader.java: Reformat.
 
+       * java/io/FileInputStream.java (skip): Call fd.getFilePointer() and
+       calculate correct number of bytes skipped.
+
 2002-03-24  Tom Tromey  <tromey@redhat.com>
 
        * java/awt/TextComponent.java (TextComponent): Editable by

diff --git a/libjava/java/io/FileInputStream.java b/libjava/java/io/FileInputStream.java
index 9d0d0133b9cf76a102d9a21bd122b494d7a192c8..6a02d2ba862e10237251d3e0288fa47e0bfd0556 100644 (file)
--- a/libjava/java/io/FileInputStream.java
+++ b/libjava/java/io/FileInputStream.java
@@ -88,6 +88,8 @@ public class FileInputStream extends InputStream
 
   public long skip(long n) throws IOException
   {
-    return n <= 0 ? 0 : fd.seek(n, FileDescriptor.CUR, true);
+    long startPos = fd.getFilePointer();
+    long endPos = fd.seek(n, FileDescriptor.CUR, true);
+    return endPos - startPos;
   }
 }