aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorbryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>2002-03-25 02:01:29 +0000
committerbryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>2002-03-25 02:01:29 +0000
commit194f956bb8f875759c57c282b5d052a26f83a6d5 (patch)
tree75acfc3ab8cecbd3c73f4db27d958e782acc1b55 /libjava
parenta935f921eda2ceda1fda0ceff8d2108b7e2683cd (diff)
* java/io/FileInputStream.java (skip): Call fd.getFilePointer() and
calculate correct number of bytes skipped. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@51293 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog3
-rw-r--r--libjava/java/io/FileInputStream.java4
2 files changed, 6 insertions, 1 deletions
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 <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 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;
}
}