* spawn.cc (spawn_guts): Restore dependency on signal_arrived. It's needed to

wake up the WaitForSingleObject.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index c04ecc297d64dcfc36e0a1be4e084b99ad755d4e..1b7c22d5049ff9d39cc19a7041d63829a6fd4e5b 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 15 14:25:38 2000  Christopher Faylor <cgf@cygnus.com>
+
+       * spawn.cc (spawn_guts): Restore dependency on signal_arrived.  It's
+       needed to wake up the WaitForSingleObject.
+
 Tue Mar 14 23:41:16 2000  Christopher Faylor <cgf@cygnus.com>
 
        Pipe changes throughout suggested by Eric Fifer <EFifer@sanwaint.com>

diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
index e4f41b26c3a25b16134df0866aade22f15f38ec8..e1a191c7b7b625fa5fe03a6219476d39edfb2f4f 100644 (file)
--- a/winsup/cygwin/spawn.cc
+++ b/winsup/cygwin/spawn.cc
@@ -635,8 +635,8 @@ skip_arg_parsing:
     {
       BOOL exited;
 
-      HANDLE waitbuf[2] = {pi.hProcess, spr};
-      int nwait = 2;
+      HANDLE waitbuf[3] = {pi.hProcess, signal_arrived, spr};
+      int nwait = 3;
 
       SetThreadPriority (GetCurrentThread (), THREAD_PRIORITY_HIGHEST);
       res = 0;
@@ -675,6 +675,10 @@ skip_arg_parsing:
                  }
              break;
            case WAIT_OBJECT_0 + 1:
+             sigproc_printf ("signal arrived");
+             ResetEvent (signal_arrived);
+             continue;
+           case WAIT_OBJECT_0 + 2:
              res = EXIT_REPARENTING;
              MALLOC_CHECK;
              ForceCloseHandle (spr);