Changeset 2784 in kBuild for trunk/src/kash

Timestamp:

May 24, 2015 5:29:04 PM (10 years ago)

Author:

bird

Message:

shinstance.c: the forked off child process doesn't have any children, of course. Fixes spin-for-ever situation on windows.

File:

• trunk/src/kash/shinstance.c (modified) (3 diffs)

trunk/src/kash/shinstance.c

@@ -928 +928 @@
 #endif
 
-    /* child: update the pid */
+    /* child: update the pid and zap the children array */
     if (!pid)
+    {
 # ifdef _MSC_VER
         psh->pid = _getpid();
@@ -935 +936 @@
         psh->pid = getpid();
 # endif
+        psh->num_children = 0;
+    }
 
     TRACE2((psh, "sh_fork -> %d [%d]\n", pid, errno));
@@ -980 +983 @@
     else if (psh->num_children <= MAXIMUM_WAIT_OBJECTS)
     {
-        HANDLE ahChildren[64];
+        HANDLE ahChildren[MAXIMUM_WAIT_OBJECTS];
         for (i = 0; i < psh->num_children; i++)
             ahChildren[i] = psh->children[i].hChild;