From acf9549ef9151cce8c62cf02c9a07809693a4891 Mon Sep 17 00:00:00 2001 From: Bryce McKinlay Date: Mon, 25 Mar 2002 02:01:29 +0000 Subject: [PATCH] FileInputStream.java (skip): Call fd.getFilePointer() and calculate correct number of bytes skipped. * java/io/FileInputStream.java (skip): Call fd.getFilePointer() and calculate correct number of bytes skipped. From-SVN: r51293 --- libjava/ChangeLog | 3 +++ libjava/java/io/FileInputStream.java | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 322b39afa22..0b15ae640a6 100644 --- 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 * java/awt/TextComponent.java (TextComponent): Editable by diff --git a/libjava/java/io/FileInputStream.java b/libjava/java/io/FileInputStream.java index 9d0d0133b9c..6a02d2ba862 100644 --- 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; } }