From 4e1388472d90347bc80dc30a94312d74c2f1c8e1 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 4 Jun 2002 16:38:13 +0000 Subject: * fhandler.h (class fhandler_socket): Add private method fixup_after_fork (bool, HANDLE). * fhandler_socket.cc (fhandler_socket::fixup_after_fork): Move functionality to new private method. Add closing parent socket if not called from dup(). Create method new calling private method with appropriate parameter. (fhandler_socket::fixup_after_exec): Call private method fixup_after_fork with appropriate parameter. (fhandler_socket::dup): Ditto. --- winsup/cygwin/fhandler_socket.cc | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'winsup/cygwin/fhandler_socket.cc') diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc index e0e5c6363..0f1f90bb7 100644 --- a/winsup/cygwin/fhandler_socket.cc +++ b/winsup/cygwin/fhandler_socket.cc @@ -184,7 +184,7 @@ fhandler_socket::fixup_before_fork_exec (DWORD win_proc_id) extern "C" void __stdcall load_wsock32 (); void -fhandler_socket::fixup_after_fork (HANDLE parent) +fhandler_socket::fixup_after_fork (bool dup, HANDLE parent) { SOCKET new_sock; @@ -208,6 +208,10 @@ fhandler_socket::fixup_after_fork (HANDLE parent) else { debug_printf ("WSASocket went fine new_sock %p, old_sock %p", new_sock, get_io_handle ()); +#if 1 + if (!dup && new_sock != (SOCKET) get_socket ()) + closesocket (get_socket ()); +#endif set_io_handle ((HANDLE) new_sock); } @@ -215,12 +219,18 @@ fhandler_socket::fixup_after_fork (HANDLE parent) fork_fixup (parent, secret_event, "secret_event"); } +void +fhandler_socket::fixup_after_fork (HANDLE parent) +{ + fixup_after_fork (false, parent); +} + void fhandler_socket::fixup_after_exec (HANDLE parent) { debug_printf ("here"); if (!get_close_on_exec ()) - fixup_after_fork (parent); + fixup_after_fork (false, parent); #if 0 else if (!winsock2_active) closesocket (get_socket ()); @@ -238,7 +248,7 @@ fhandler_socket::dup (fhandler_base *child) fhs->fixup_before_fork_exec (GetCurrentProcessId ()); if (winsock2_active) { - fhs->fixup_after_fork (hMainProc); + fhs->fixup_after_fork (true, hMainProc); return 0; } return fhandler_base::dup (child); -- cgit v1.2.3