* java/lang/Win32Process.java: Added comment.

	* include/posix.h (_Jv_platform_close_on_exec): New function.
	Include fcntl.h.
	* include/win32.h (_Jv_platform_close_on_exec): New function.
	* java/net/natPlainSocketImpl.cc (create): Set close-on-exec
	flag.
	(accept): Likewise.
	* java/net/natPlainDatagramSocketImpl.cc (create): Set
	close-on-exec flag.
	* java/io/natFileDescriptorPosix.cc (open): Set close-on-exec
	flag.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@50536 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1a36a3c..205b8b3 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,17 @@
+2002-03-10  Tom Tromey  <tromey@redhat.com>
+
+       * java/lang/Win32Process.java: Added comment.
+       * include/posix.h (_Jv_platform_close_on_exec): New function.
+       Include fcntl.h.
+       * include/win32.h (_Jv_platform_close_on_exec): New function.
+       * java/net/natPlainSocketImpl.cc (create): Set close-on-exec
+       flag.
+       (accept): Likewise.
+       * java/net/natPlainDatagramSocketImpl.cc (create): Set
+       close-on-exec flag.
+       * java/io/natFileDescriptorPosix.cc (open): Set close-on-exec
+       flag.
+
 2002-03-09  Tom Tromey  <tromey@redhat.com>
 
        * verify.cc (state::NO_STACK): New constant.

diff --git a/libjava/include/posix.h b/libjava/include/posix.h
index f965074..05c6ddf 100644 (file)
--- a/libjava/include/posix.h
+++ b/libjava/include/posix.h
@@ -28,13 +28,17 @@ details.  */
 #include <unistd.h>
 #endif
 
+#include <fcntl.h>
+
 #include <gcj/cni.h>
 
 extern int _Jv_select (int n, fd_set *, fd_set *, fd_set *, struct timeval *);
 extern jlong _Jv_platform_gettimeofday ();
 extern void _Jv_platform_initialize (void);
 
-
-
-
-
+inline void
+_Jv_platform_close_on_exec (jint fd)
+{
+  // Ignore errors.
+  fcntl (fd, F_SETFD, FD_CLOEXEC);
+}

diff --git a/libjava/include/win32.h b/libjava/include/win32.h
index c2ecbff..73eb0c8 100644 (file)
--- a/libjava/include/win32.h
+++ b/libjava/include/win32.h
@@ -21,4 +21,9 @@ details.  */
 extern void _Jv_platform_initialize (void);
 extern jlong _Jv_platform_gettimeofday ();
 
+void _Jv_platform_close_on_exec (jint)
+{
+  // Ignore.
+}
+
 #endif /* __JV_WIN32_H__ */

diff --git a/libjava/java/io/natFileDescriptorPosix.cc b/libjava/java/io/natFileDescriptorPosix.cc
index 5352f99..bfe0009 100644 (file)
--- a/libjava/java/io/natFileDescriptorPosix.cc
+++ b/libjava/java/io/natFileDescriptorPosix.cc
@@ -17,7 +17,6 @@ details.  */
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/param.h>
-#include <fcntl.h>
 
 #ifdef HAVE_SYS_IOCTL_H
 #define BSD_COMP /* Get FIONREAD on Solaris2. */
@@ -122,6 +121,9 @@ java::io::FileDescriptor::open (jstring path, jint jflags)
       sprintf (msg, "%s (%s)", buf, strerror (errno));
       throw new FileNotFoundException (JvNewStringLatin1 (msg));
     }
+
+  _Jv_platform_close_on_exec (fd);
+
   return fd;
 }
 

diff --git a/libjava/java/lang/Win32Process.java b/libjava/java/lang/Win32Process.java
index 00ee6b2..0af2457 100644 (file)
--- a/libjava/java/lang/Win32Process.java
+++ b/libjava/java/lang/Win32Process.java
@@ -21,6 +21,11 @@ import java.io.IOException;
 
 // This is entirely internal to our implementation.
 
+// NOTE: when this is implemented, we'll need to add
+// HANDLE_FLAG_INHERIT in FileDescriptor and other places, to make
+// sure that file descriptors aren't inherited by the child process.
+// See _Jv_platform_close_on_exec.
+
 // This file is copied to `ConcreteProcess.java' before compilation.
 // Hence the class name apparently does not match the file name.
 final class ConcreteProcess extends Process

diff --git a/libjava/java/net/natPlainDatagramSocketImpl.cc b/libjava/java/net/natPlainDatagramSocketImpl.cc
index 628ac62..81e17cc 100644 (file)
--- a/libjava/java/net/natPlainDatagramSocketImpl.cc
+++ b/libjava/java/net/natPlainDatagramSocketImpl.cc
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000  Free Software Foundation
+/* Copyright (C) 1999, 2000, 2002  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -185,6 +185,9 @@ java::net::PlainDatagramSocketImpl::create ()
       char* strerr = strerror (errno);
       throw new java::net::SocketException (JvNewStringUTF (strerr));
     }
+
+  _Jv_platform_close_on_exec (sock);
+
   fnum = sock;
   fd = new java::io::FileDescriptor (sock);
 }

diff --git a/libjava/java/net/natPlainSocketImpl.cc b/libjava/java/net/natPlainSocketImpl.cc
index 99eb80b..dd8d2cc 100644 (file)
--- a/libjava/java/net/natPlainSocketImpl.cc
+++ b/libjava/java/net/natPlainSocketImpl.cc
@@ -232,6 +232,9 @@ java::net::PlainSocketImpl::create (jboolean stream)
       char* strerr = strerror (errno);
       throw new java::io::IOException (JvNewStringUTF (strerr));
     }
+
+  _Jv_platform_close_on_exec (sock);
+
   fnum = sock;
   fd = new java::io::FileDescriptor (sock);
 }
@@ -374,6 +377,9 @@ java::net::PlainSocketImpl::accept (java::net::PlainSocketImpl *s)
   new_socket = _Jv_accept (fnum, (sockaddr*) &u, &addrlen);
   if (new_socket < 0)
     goto error;
+
+  _Jv_platform_close_on_exec (new_socket);
+
   jbyteArray raddr;
   jint rport;
   if (u.address.sin_family == AF_INET)