* exceptions.cc (set_console_handler): Don't allocate

console_handler_thread_waiter.  It is obsolete.
(ctrl_c_handler): Don't use console_handler_thread_waiter.
* path.cc (hash_path_name): Fix handling of relative names.  Make case
insensitive.
* path.h (suffix_info): Use initializers.
* pinfo.h (_pinfo): Avoid initializers for null case.
* resource.cc (fill_rusage): Zero rest of rusage structure.
* security.cc (set_process_privileges): Don't reopen parent process.  Just use
hMainProc.
* signal.cc (signal): Track when a signal handler has been used.
(sigaction): Ditto.
* sigproc.cc (pchildren): Use default initializer.
(zombies): Ditto.
(sigproc_terminate): Avoid closing handles that will be closed on exit anyway.
(wait_sig): Send signal to "parent" on EXECing, not FORKing.
(wait_subproc): Send SIGCHLD here rather than in proc_wait to avoid potential
muto conflicts.
* sigproc.h (sigthread): Don't initialize to zero.  It's the default.
* spawn.cc (spawn_guts): Fill in resources from exec parent prior to
termination.
* sync.h (muto): Don't initialize to zero.
* syscalls.cc (close_all_files): Use one lock around entire loop and call
fhandler close/release stuff directly.
(_read): Don't use ready_for_read if there are not signal handlers active.
* dcrt0.cc (dll_crt0_1): Fix display of "title".
(do_exit): Use pinfo exit method to exit.
(__api_fatal): Ditto.
* exceptions.cc (signal_exit): Ditto.
* fork.cc (fork_child): Remove debugging stuff.  Use pinfo_fixup_after fork in
place of exec_fixup_after_fork.
* pinfo.cc (pinfo_fixup_after_fork): New method.
(pinfo_fixup_in_spawned_child): Ditto.
(_pinfo::exit): New method.
(_pinfo::init): Remove recursion.  Detect pathological case where pinfo
structure already exists for new pid.
* pinfo.h (_pinfo): Reorganize slightly.  Add new method and new function
declarations.
* sigproc.cc (proc_exists): Previous simplification was a little to simple.
Try harder to detect if a process exists.
(proc_terminate): Use PID_EXITED setting to determine if process is still
around.
(WFSO): Remove debugging statement.
(WFMO): Ditto.
* spawn.cc (exec_fixup_after_fork): Eliminate.
(spawn_guts): Always set old_title to NULL.  Is it really needed?  Move
hexec_proc to pinfo.cc.  Call pinfo_fixup_in_spawned_child to eliminate handle
link after a spawn.
* include/sys/cygwin.h: Remove PID_NOT_IN_USE.  Add PID_EXITED.

1 files changed, 15 insertions, 29 deletions

diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
index 0aab714c1..6939ad578 100644
--- a/winsup/cygwin/spawn.cc
+++ b/winsup/cygwin/spawn.cc
@@ -219,16 +219,6 @@ linebuf::prepend (const char *what, int len)
   ix = newix;
 }
 
-static HANDLE hexec_proc = NULL;
-
-void __stdcall
-exec_fixup_after_fork ()
-{
-  if (hexec_proc)
-    CloseHandle (hexec_proc);
-  hexec_proc = NULL;
-}
-
 class av
 {
   char **argv;
@@ -351,7 +341,7 @@ spawn_guts (HANDLE hToken, const char * prog_arg, const char *const *argv,
      }
 
   ciresrv.moreinfo = (cygheap_exec_info *) ccalloc (HEAP_1_EXEC, 1, sizeof (cygheap_exec_info));
-  ciresrv.moreinfo->old_title = old_title ? cstrdup (old_title) : NULL;
+  ciresrv.moreinfo->old_title = NULL;
   ciresrv.moreinfo->fds = fdtab;
   ciresrv.moreinfo->nfds = fdtab.size;
 
@@ -562,14 +552,6 @@ skip_arg_parsing:
   if (!hToken && myself->token != INVALID_HANDLE_VALUE)
     hToken = myself->token;
 
-  /* FIXME:  This leaves a handle to the process open so that the pid is not
-     duplicated.  However, if a process execs another process two handles are
-     left open, which is unnecessary. */
-  if (mode == _P_OVERLAY && !hexec_proc &&
-      !DuplicateHandle (hMainProc, hMainProc, hMainProc, &hexec_proc, 0,
-			TRUE, DUPLICATE_SAME_ACCESS))
-    system_printf ("couldn't save current process handle %p, %E", hMainProc);
-
   if (hToken)
     {
       /* allow the child to interact with our window station/desktop */
@@ -631,18 +613,18 @@ skip_arg_parsing:
 	seteuid (uid);
     }
   else
-    rc = CreateProcessA (real_path,	/* image name - with full path */
-		       one_line.buf,	/* what was passed to exec */
+    rc = CreateProcess (real_path,	/* image name - with full path */
+		        one_line.buf,	/* what was passed to exec */
 					/* process security attrs */
-		       allow_ntsec ? sec_user (sa_buf) : &sec_all_nih,
+		        allow_ntsec ? sec_user (sa_buf) : &sec_all_nih,
 					/* thread security attrs */
-		       allow_ntsec ? sec_user (sa_buf) : &sec_all_nih,
-		       TRUE,	/* inherit handles from parent */
-		       flags,
-		       envblock,/* environment */
-		       0,	/* use current drive/directory */
-		       &si,
-		       &pi);
+		        allow_ntsec ? sec_user (sa_buf) : &sec_all_nih,
+		        TRUE,	/* inherit handles from parent */
+		        flags,
+		        envblock,/* environment */
+		        0,	/* use current drive/directory */
+		        &si,
+		        &pi);
 
   MALLOC_CHECK;
   if (envblock)
@@ -691,6 +673,7 @@ skip_arg_parsing:
     }
   else
     {
+      pinfo_fixup_in_spawned_child (pi.hProcess);
       pinfo child (cygpid, 1);
       if (!child)
 	{
@@ -859,6 +842,9 @@ skip_arg_parsing:
     {
     case _P_OVERLAY:
       proc_terminate ();
+      struct rusage r;
+      fill_rusage (&r, hMainProc);
+      add_rusage (&myself->rusage_self, &r);
       ExitProcess (0);
       break;
     case _P_WAIT: