From: Tom Tromey <tromey@redhat.com>
Date: Wed, 6 Mar 2002 23:23:34 +0000 (+0000)
Subject: natFileDescriptorEcos.cc (init): Don't use GetStdHandle.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=51532731d141d998342b6e3006194c38b4289eac;p=gcc.git

natFileDescriptorEcos.cc (init): Don't use GetStdHandle.

	* java/io/natFileDescriptorEcos.cc (init): Don't use
	GetStdHandle.
	* java/io/natFileDescriptorPosix.cc (valid): Don't call stat if FD
	is negative.
	(init): Don't use GetStdHandle.

From-SVN: r50383
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f96bbab1b25..6de0a688728 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,11 @@
 2002-03-06  Tom Tromey  <tromey@redhat.com>
 
+	* java/io/natFileDescriptorEcos.cc (init): Don't use
+	GetStdHandle.
+	* java/io/natFileDescriptorPosix.cc (valid): Don't call stat if FD
+	is negative.
+	(init): Don't use GetStdHandle.
+
 	* include/config.h.in: Rebuilt.
 	* configure: Rebuilt.
 	* Makefile.in: Rebuilt.
diff --git a/libjava/java/io/natFileDescriptorEcos.cc b/libjava/java/io/natFileDescriptorEcos.cc
index 81e10e2e559..8e1dd950b8f 100644
--- a/libjava/java/io/natFileDescriptorEcos.cc
+++ b/libjava/java/io/natFileDescriptorEcos.cc
@@ -1,6 +1,6 @@
 // natFileDescriptor.cc - Native part of FileDescriptor class.
 
-/* Copyright (C) 1998, 1999, 2001  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2001, 2002  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -44,9 +44,9 @@ diag_write (char *data, int len)
 void
 java::io::FileDescriptor::init(void)
 {
-  in = new java::io::FileDescriptor((jint)(GetStdHandle (0)));
-  out = new java::io::FileDescriptor((jint)(GetStdHandle (1)));
-  err = new java::io::FileDescriptor((jint)(GetStdHandle (2)));
+  in = new java::io::FileDescriptor(0);
+  out = new java::io::FileDescriptor(1);
+  err = new java::io::FileDescriptor(2);
 }
 
 jboolean
diff --git a/libjava/java/io/natFileDescriptorPosix.cc b/libjava/java/io/natFileDescriptorPosix.cc
index 83a1261de0d..5352f99cc63 100644
--- a/libjava/java/io/natFileDescriptorPosix.cc
+++ b/libjava/java/io/natFileDescriptorPosix.cc
@@ -1,6 +1,6 @@
 // natFileDescriptor.cc - Native part of FileDescriptor class.
 
-/* Copyright (C) 1998, 1999, 2000, 2001  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000, 2001, 2002  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -46,18 +46,18 @@ details.  */
 #define NO_FSYNC_MESSAGE "sync unsupported"
 
 void
-java::io::FileDescriptor::init(void)
+java::io::FileDescriptor::init (void)
 {
-  in = new java::io::FileDescriptor((jint)(GetStdHandle (0)));
-  out = new java::io::FileDescriptor((jint)(GetStdHandle (1)));
-  err = new java::io::FileDescriptor((jint)(GetStdHandle (2)));
+  in = new java::io::FileDescriptor(0);
+  out = new java::io::FileDescriptor(1);
+  err = new java::io::FileDescriptor(2);
 }
 
 jboolean
 java::io::FileDescriptor::valid (void)
 {
   struct stat sb;
-  return ::fstat (fd, &sb) == 0;
+  return fd >= 0 && ::fstat (fd, &sb) == 0;
 }
 
 void