From fa9699000423f3e3229549c9048b01cd8e9b82fa Mon Sep 17 00:00:00 2001 From: tromey Date: Sun, 10 Mar 2002 17:59:23 +0000 Subject: * 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 --- libjava/java/net/natPlainDatagramSocketImpl.cc | 5 ++++- libjava/java/net/natPlainSocketImpl.cc | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'libjava/java/net') diff --git a/libjava/java/net/natPlainDatagramSocketImpl.cc b/libjava/java/net/natPlainDatagramSocketImpl.cc index 628ac620f9a..81e17cc52a7 100644 --- 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 99eb80b370e..dd8d2ccdd55 100644 --- 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) -- cgit v1.2.3