From 5e18b3d6a653eeb64d92597536feac32ea1be0b9 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 9 Mar 2003 22:50:02 +0000 Subject: [PATCH] re PR libgcj/9934 (Bugs in natFileDescriptorPosix.cc:available()) PR libgcj/9934: * java/io/natFileDescriptorPosix.cc (available): Fixed arguments to lseek. Return 0 if we can't compute the value. From-SVN: r64053 --- libjava/ChangeLog | 6 ++++++ libjava/java/io/natFileDescriptorPosix.cc | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 5dd727379b2..8689e79a3d4 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2003-03-09 Tom Tromey + + PR libgcj/9934: + * java/io/natFileDescriptorPosix.cc (available): Fixed arguments + to lseek. Return 0 if we can't compute the value. + 2003-03-03 Michael Koch * java/net/NetworkInterface.java: Merged with classpath. diff --git a/libjava/java/io/natFileDescriptorPosix.cc b/libjava/java/io/natFileDescriptorPosix.cc index e8ec9a7e733..ad1dcc49c32 100644 --- a/libjava/java/io/natFileDescriptorPosix.cc +++ b/libjava/java/io/natFileDescriptorPosix.cc @@ -371,7 +371,7 @@ java::io::FileDescriptor::available (void) off_t where = 0; if (fstat (fd, &sb) != -1 && S_ISREG (sb.st_mode) - && (where = lseek (fd, SEEK_CUR, 0)) != (off_t) -1) + && (where = lseek (fd, 0, SEEK_CUR)) != (off_t) -1) { num = (long) (sb.st_size - where); num_set = true; @@ -397,6 +397,6 @@ java::io::FileDescriptor::available (void) return (jint) num; #else - throw new IOException (JvNewStringLatin1 ("unimplemented")); + return 0; #endif } -- 2.30.2