Changeset 1391 for branches/GNU/src/gcc/libjava/java/io/natFileDescriptorWin32.cc

Timestamp:

Apr 27, 2004, 8:39:34 PM (22 years ago)

Author:

bird

Message:

GCC v3.3.3 sources.

Location:

branches/GNU/src/gcc

Files:

• . (modified) (1 prop)
• libjava/java/io/natFileDescriptorWin32.cc (modified) (6 diffs, 1 prop)

branches/GNU/src/gcc

@@ -26 +26 @@
 configure.vr
 configure.vrs
+
 Makefile
-dir.info
 lost+found
 update.out

@@ -26 +26 @@
 configure.vr
 configure.vrs
+
 Makefile
-dir.info
 lost+found
 update.out

branches/GNU/src/gcc/libjava/java/io/natFileDescriptorWin32.cc

@@ -1 +1 @@
 // natFileDescriptorWin32.cc - Native part of FileDescriptor class.
 
-/* Copyright (C) 1998, 1999, 2000, 2001  Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003  Free Software 
+   Foundation, Inc.
 
    This file is part of libgcj.
@@ -33 +34 @@
 #include <java/io/FileNotFoundException.h>
 
+
+
+
 void
 java::io::FileDescriptor::init(void)
@@ -119 +123 @@
     }
 
+
+
+
+
+
+
+
   return (jint)handle;
 }
@@ -177 +188 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 jint
 java::io::FileDescriptor::seek (jlong pos, jint whence, jboolean eof_trunc)
@@ -227 +290 @@
 
   if (! ReadFile ((HANDLE)fd, &buf, 1, &read, NULL))
-    throw new IOException (JvNewStringLatin1 (winerr ()));
+    {
+      if (GetLastError () == ERROR_BROKEN_PIPE)
+        return -1;
+      else
+        throw new IOException (JvNewStringLatin1 (winerr ()));
+    }
+
   if (! read)
     return -1;
@@ -244 +313 @@
     throw new java::lang::ArrayIndexOutOfBoundsException;
 
+
+
+
+
   jbyte *bytes = elements (buffer) + offset;
 
   DWORD read;
   if (! ReadFile((HANDLE)fd, bytes, count, &read, NULL))
-    throw new IOException (JvNewStringLatin1 (winerr ()));
+    {
+      if (GetLastError () == ERROR_BROKEN_PIPE)
+        return -1;
+      else
+        throw new IOException (JvNewStringLatin1 (winerr ()));
+    }
 
   if (read == 0) return -1;
+
   return (jint)read;
 }

@@ -26 +26 @@
 configure.vr
 configure.vrs
+
 Makefile
-dir.info
 lost+found
 update.out