* dcrt0.cc (dll_crt0_1): Move set_os_type.

(_dll_crt0): To here.
(cygwin_dll_init): And here.
* external.cc (fillout_pinfo): Use more foolproof method for scanning for pids.
* pinfo.cc (set_myself): Eliminate myself_identity.init.
* sigproc.cc (wait_sig): Do it here instead to reduce the amount of time where
there could potentially be two processes with the same pid.
* spawn.cc (spawn_guts): Eliminate duplicate initialization.
* include/sys/cygwin.h: Mark unused PID_* elements.

1 files changed, 8 insertions, 9 deletions

diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
index c9a9c3a11..63e9a7a93 100644
--- a/winsup/cygwin/spawn.cc
+++ b/winsup/cygwin/spawn.cc
@@ -655,14 +655,14 @@ skip_arg_parsing:
       proc_terminate ();
       hExeced = pi.hProcess;
 
-    /* Set up child's signal handlers */
-    /* CGF FIXME - consolidate with signal stuff below */
-    for (i = 0; i < NSIG; i++)
-      {
-	myself->getsig(i).sa_mask = 0;
-	if (myself->getsig(i).sa_handler != SIG_IGN || (mode != _P_OVERLAY))
-	  myself->getsig(i).sa_handler = SIG_DFL;
-      }
+      /* Set up child's signal handlers */
+      /* CGF FIXME - consolidate with signal stuff below */
+      for (i = 0; i < NSIG; i++)
+	{
+	  myself->getsig(i).sa_mask = 0;
+	  if (myself->getsig(i).sa_handler != SIG_IGN || (mode != _P_OVERLAY))
+	    myself->getsig(i).sa_handler = SIG_DFL;
+	}
     }
   else
     {
@@ -696,7 +696,6 @@ skip_arg_parsing:
       child->rootlen = myself->rootlen;
       child->dwProcessId = pi.dwProcessId;
       child->hProcess = pi.hProcess;
-      child->process_state |= PID_INITIALIZING;
       for (i = 0; i < NSIG; i++)
 	{
 	  child->getsig(i).sa_mask = 0;