Changeset 3467 for trunk/src

Timestamp:

Sep 15, 2020, 11:30:11 PM (5 years ago)

Author:

bird

Message:

kash: subshellstatus build fixes for forked mode.

Location:

trunk/src/kash

Files:

• shinstance.c (modified) (6 diffs)
• shinstance.h (modified) (1 diff)

trunk/src/kash/shinstance.c

@@ -1544 +1544 @@
  * @param   sts         Subshell status structure, NULL if progress.
  */
-int sh_add_child(shinstance *psh, shpid pid, void *hChild, shsubshellstatus *sts)
+int sh_add_child(shinstance *psh, shpid pid, void *hChild, struct shsubshellstatus *sts)
 {
     /* get a free table entry. */
@@ -1789 +1789 @@
         {
             DWORD dwExitCode = 127;
-#ifndef SH_FORKED_MODE
+# ifndef SH_FORKED_MODE
             if (psh->children[i].subshellstatus)
             {
@@ -1801 +1801 @@
             }
             else
-#endif
+# endif
             if (GetExitCodeProcess(hChild, &dwExitCode))
             {
@@ -1814 +1814 @@
 
         /* close and remove */
+# ifndef SH_FORKED_MODE
         if (psh->children[i].subshellstatus)
         {
@@ -1820 +1821 @@
         }
         else
+# endif
         {
             rc = CloseHandle(psh->children[i].hChild);
@@ -1829 +1831 @@
             psh->children[i] = psh->children[psh->num_children];
         psh->children[psh->num_children].hChild = NULL;
+# ifndef SH_FORKED_MODE
         psh->children[psh->num_children].subshellstatus = NULL;
+# endif
     }
 

trunk/src/kash/shinstance.h

@@ -516 +516 @@
 
 /* wait / process */
-int sh_add_child(shinstance *psh, shpid pid, void *hChild, shsubshellstatus *sts);
+int sh_add_child(shinstance *psh, shpid pid, void *hChild, struct shsubshellstatus *sts);
 #ifdef _MSC_VER
 #   include <process.h>