WIN-28.1: fix POSIX file descriptor numbering assumptions

[Adam Megacz]

Bryce McKinlay <bryce@waitaki.otago.ac.nz> writes:
> OK, thanks. But can you add a FIXME regarding the pointer -> jint cast 
> in the Win32 code?

Certainly. Committed as shown below.

  - a

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

        * java/io/FileDescriptor.java: Initialize in/out/err in init().
        * java/io/natFileDescriptorWin32.cc (init()): Added function.
        * java/io/natFileDescriptorPosix.cc (init()): Added function.
        * java/io/natFileDescriptorEcos.cc (init()): Added function.

Index: FileDescriptor.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/io/FileDescriptor.java,v
retrieving revision 1.8
diff -u -r1.8 FileDescriptor.java
--- FileDescriptor.java	2001/08/31 22:31:40	1.8
+++ FileDescriptor.java	2002/03/06 22:33:53
@@ -24,13 +24,19 @@
 // if need be.
 public final class FileDescriptor
 {
-  public static final FileDescriptor in = new FileDescriptor (0);
-  public static final FileDescriptor out = new FileDescriptor (1);
-  public static final FileDescriptor err = new FileDescriptor (2);
 
+  public static final FileDescriptor in = null;
+  public static final FileDescriptor out = null;
+  public static final FileDescriptor err = null;
+
+  private static native void init();
+  static
+  {
+    init();
+  }
+
   public native void sync () throws SyncFailedException;
   public native boolean valid ();
-
 
   // These are mode values for open().
   static final int READ   = 1;
Index: natFileDescriptorEcos.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/io/natFileDescriptorEcos.cc,v
retrieving revision 1.6
diff -u -r1.6 natFileDescriptorEcos.cc
--- natFileDescriptorEcos.cc	2001/08/02 23:46:39	1.6
+++ natFileDescriptorEcos.cc	2002/03/06 22:33:53
@@ -41,6 +41,14 @@
 
 #define NO_FSYNC_MESSAGE "sync unsupported"
 
+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)));
+}
+
 jboolean
 java::io::FileDescriptor::valid (void)
 {
Index: natFileDescriptorPosix.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/io/natFileDescriptorPosix.cc,v
retrieving revision 1.16
diff -u -r1.16 natFileDescriptorPosix.cc
--- natFileDescriptorPosix.cc	2001/09/21 04:23:31	1.16
+++ natFileDescriptorPosix.cc	2002/03/06 22:33:53
@@ -45,6 +45,14 @@
 
 #define NO_FSYNC_MESSAGE "sync unsupported"
 
+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)));
+}
+
 jboolean
 java::io::FileDescriptor::valid (void)
 {
Index: natFileDescriptorWin32.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/io/natFileDescriptorWin32.cc,v
retrieving revision 1.5
diff -u -r1.5 natFileDescriptorWin32.cc
--- natFileDescriptorWin32.cc	2002/02/12 02:17:21	1.5
+++ natFileDescriptorWin32.cc	2002/03/06 22:33:53
@@ -32,6 +32,17 @@
 #include <java/lang/Thread.h>
 #include <java/io/FileNotFoundException.h>
 
+// FIXME: casting a FILE (pointer) to a jint will not work on Win64 --
+//        we should be using gnu.gcj.RawData's.
+
+void
+java::io::FileDescriptor::init(void)
+{
+  in = new java::io::FileDescriptor((jint)(GetStdHandle (STD_INPUT_HANDLE)));
+  out = new java::io::FileDescriptor((jint)(GetStdHandle (STD_OUTPUT_HANDLE)));
+  err = new java::io::FileDescriptor((jint)(GetStdHandle (STD_ERROR_HANDLE)));
+}
+
 static char *
 winerr (void)
 {