Changeset 3441 in kBuild

Timestamp:

Sep 10, 2020 11:54:53 AM (5 years ago)

Author:

bird

Message:

kash: sh_getenv loop-for-ever fix. sh_exec threaded-mode fix.

File:

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

trunk/src/kash/shinstance.c

@@ -67 +67 @@
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
+#ifndef SH_FORKED_MODE
+/** Mutex serializing exec/spawn to prevent unwanted file inherting. */
+static shmtx        g_sh_exec_mtx;
+#endif
 /** The mutex protecting the the globals and some shell instance members (sigs). */
 static shmtx        g_sh_mtx;
@@ -640 +644 @@
     assert(g_sh_mtx.au64[SHMTX_MAGIC_IDX] != SHMTX_MAGIC);
     shmtx_init(&g_sh_mtx);
+#ifndef SH_FORKED_MODE
+    shmtx_init(&g_sh_exec_mtx);
+#endif
 
     psh = sh_create_shell_common(argv, envp, NULL /*parentfdtab*/);
@@ -785 +792 @@
             &&  item[len] == '=')
             return (char *)item + len + 1;
+        i++;
     }
 
@@ -1650 +1658 @@
         shfile_uninit(&psh->fdtab);
         sh_int_unlink(psh);
+        /** @todo    */
     }
 
@@ -1698 +1707 @@
          * This ain't quite straight forward on Windows...
          */
+#ifndef SH_FORKED_MODE
+        shmtxtmp tmp;
+#endif
         PROCESS_INFORMATION ProcInfo;
         STARTUPINFO StrtInfo;
@@ -1809 +1821 @@
 
         /* File handles. */
+#ifndef SH_FORKED_MODE
+        shmtx_enter(&g_sh_exec_mtx, &tmp);
+#endif
         StrtInfo.dwFlags   |= STARTF_USESTDHANDLES;
         StrtInfo.lpReserved2 = shfile_exec_win(&psh->fdtab, 1 /* prepare */, &StrtInfo.cbReserved2, hndls);
@@ -1816 +1831 @@
 
         /* Get going... */
-        if (CreateProcess(exe,
-                          cmdline,
-                          NULL,         /* pProcessAttributes */
-                          NULL,         /* pThreadAttributes */
-                          TRUE,         /* bInheritHandles */
-                          0,            /* dwCreationFlags */
-                          envblock,
-                          cwd,
-                          &StrtInfo,
-                          &ProcInfo))
+        rc = CreateProcess(exe,
+                           cmdline,
+                           NULL,         /* pProcessAttributes */
+                           NULL,         /* pThreadAttributes */
+                           TRUE,         /* bInheritHandles */
+                           0,            /* dwCreationFlags */
+                           envblock,
+                           cwd,
+                           &StrtInfo,
+                           &ProcInfo);
+
+        shfile_exec_win(&psh->fdtab, 0 /* done */, NULL, NULL);
+#ifndef SH_FORKED_MODE
+        shmtx_leave(&g_sh_exec_mtx, &tmp);
+#endif
+        if (rc)
         {
             DWORD dwErr;
@@ -1837 +1858 @@
             {
                 CloseHandle(ProcInfo.hProcess);
-                _exit(dwExitCode);
+                sh__exit(psh, dwExitCode);
             }
+            TRACE2((psh, "sh_execve: GetExitCodeProcess failed: %u\n", GetLastError()));
+            assert(0);
+            CloseHandle(ProcInfo.hProcess);
             errno = EINVAL;
         }
@@ -1857 +1881 @@
         }
 
-        shfile_exec_win(&psh->fdtab, 0 /* done */, NULL, NULL);
     }
     rc = -1;