OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2003-02-11 Ranjit Mathew <rmathew@hotmail.com>

Browse Source 
* java/io/natFileDescriptorWin32.cc
	(java::io::FileDescriptor::read): Return -1 (EOF) if ReadFile( )
	returns with Win32 error code ERROR_BROKEN_PIPE.

From-SVN: r62722
This commit is contained in:
Ranjit Mathew 2003-02-11 20:55:26 +00:00 committed by Tom Tromey
parent 2026dcf90a
commit 668ec08303
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -1,3 +1,9 @@
2003-02-11 Ranjit Mathew <rmathew@hotmail.com>
* java/io/natFileDescriptorWin32.cc
(java::io::FileDescriptor::read): Return -1 (EOF) if ReadFile( )
returns with Win32 error code ERROR_BROKEN_PIPE.
2003-02-11 Michael Koch <konqueror@gmx.de>
* Makefile.in

19
libjava/java/io/natFileDescriptorWin32.cc
View File

@ -1,6 +1,7 @@
// natFileDescriptorWin32.cc - Native part of FileDescriptor class.
/* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software
Foundation, Inc.
This file is part of libgcj.
@ -288,7 +289,13 @@ java::io::FileDescriptor::read(void)
DWORD read;
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;
else
@ -313,9 +320,15 @@ java::io::FileDescriptor::read(jbyteArray buffer, jint offset, jint count)
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;
}