From af5fcbd02e4a9f17a53fc27dd90db17a79ab96f3 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Sun, 6 Apr 2003 15:51:06 +0000 Subject: [PATCH] 2003-04-06 Michael Koch * java/io/FileInputStream.java (skip): Renamed some variables to match classpath, added checks from classpath. From-SVN: r65300 --- libjava/ChangeLog | 6 ++++++ libjava/java/io/FileInputStream.java | 15 +++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 506882d1e1bb..3390db708031 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2003-04-06 Michael Koch + + * java/io/FileInputStream.java + (skip): Renamed some variables to match classpath, added + checks from classpath. + 2003-03-31 Michael Koch * javax/swing/AbstractAction.java diff --git a/libjava/java/io/FileInputStream.java b/libjava/java/io/FileInputStream.java index 50abeaa6e670..b49922ed17ae 100644 --- a/libjava/java/io/FileInputStream.java +++ b/libjava/java/io/FileInputStream.java @@ -268,11 +268,18 @@ public class FileInputStream extends InputStream * * @exception IOException If an error occurs */ - public long skip(long n) throws IOException + public long skip (long numBytes) throws IOException { - long startPos = fd.getFilePointer(); - long endPos = fd.seek(n, FileDescriptor.CUR, true); - return endPos - startPos; + if (numBytes < 0) + throw new IllegalArgumentException ( "Can't skip negative bytes: " + + numBytes); + + if (numBytes == 0) + return 0; + + long curPos = fd.getFilePointer (); + long newPos = fd.seek (numBytes, FileDescriptor.CUR, true); + return newPos - curPos; } /** -- 2.47.3