natFileDescriptorWin32.cc (read): Return -1 if zero bytes read and no failure code...

2002-03-09  Adam Megacz  <adam@xwt.org>

        * java/io/natFileDescriptorWin32.cc (read): Return -1 if zero
        bytes read and no failure code returned.

From-SVN: r50519

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ad2364093c58a932928fbe429aac9216324a145b..6df3cfaa8918be32ead8ba6369a735a715bf3b87 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-09  Adam Megacz  <adam@xwt.org>
+
+        * java/io/natFileDescriptorWin32.cc (read): Return -1 if zero
+        bytes read and no failure code returned.
+
 2002-03-09  Adam Megacz  <adam@xwt.org>
 
         * win32.cc (_CRT_MT, __mingwthr_key_dtor) Added fake

diff --git a/libjava/java/io/natFileDescriptorWin32.cc b/libjava/java/io/natFileDescriptorWin32.cc
index 4a9d690bf2c196ec69d3c99f6cff47c20cb15ae1..694272a67bdeb8abd46036e09d1266f2ae25b643 100644 (file)
--- a/libjava/java/io/natFileDescriptorWin32.cc
+++ b/libjava/java/io/natFileDescriptorWin32.cc
@@ -255,6 +255,7 @@ java::io::FileDescriptor::read(jbyteArray buffer, jint offset, jint count)
   if (! ReadFile((HANDLE)fd, bytes, count, &read, NULL))
     throw new IOException (JvNewStringLatin1 (winerr ()));
 
+  if (read == 0) return -1;
   return (jint)read;
 }