Changeset 3173 in kBuild for trunk/src/kmk/kmkbuiltin/redirect.c

Timestamp:

Mar 21, 2018 9:37:41 PM (7 years ago)

Author:

bird

Message:

kmkbultin: environment fixes and stats.

File:

• trunk/src/kmk/kmkbuiltin/redirect.c (modified) (14 diffs)

trunk/src/kmk/kmkbuiltin/redirect.c

@@ -74 +74 @@
 #include "kmkbuiltin.h"
 #ifdef KMK
-# include "job.h"
-# include "variable.h"
 # ifdef KBUILD_OS_WINDOWS
 #  ifndef CONFIG_NEW_WIN_CHILDREN
@@ -1161 +1159 @@
                 /* Windows is slightly complicated due to handles and winchildren.c. */
                 HANDLE hProcess = INVALID_HANDLE_VALUE;
-                rcExit = kRedirectCreateProcessWindows(pszExecutable, cArgs, papszArgs, papszEnvVars, pszCwd,
-                                                       cOrders, paOrders, &hProcess);
+                rcExit = kRedirectCreateProcessWindows(pszExecutable, cArgs, papszArgs, papszEnvVars,
+                                                       pszSavedCwd ? pszCwd : NULL, cOrders, paOrders, &hProcess);
                 if (rcExit == 0)
                 {
@@ -1168 +1166 @@
                     if (process_kmk_register_redirect(hProcess, pPidSpawned) == 0)
 #  else
-                    if (MkWinChildCreateRedirect((intptr_t)hProcess, pPidSpawned) == 0)
+                    if (   pPidSpawned
+                        && MkWinChildCreateRedirect((intptr_t)hProcess, pPidSpawned) == 0)
 #  endif
                     {
@@ -1180 +1179 @@
                         warn("sub_proc is out of slots, waiting for child...");
 #  else
-                        warn("MkWinChildCreateRedirect failed...");
+                        if (pPidSpawned)
+                            warn("MkWinChildCreateRedirect failed...");
 #  endif
                         dwTmp = WaitForSingleObject(hProcess, INFINITE);
@@ -1196 +1196 @@
 
                         CloseHandle(hProcess);
-                        *pPidSpawned = 0;
+                        if (pPidSpawned)
+                            *pPidSpawned = 0;
                         *pfIsChildExitCode = K_TRUE;
                     }
@@ -1234 +1235 @@
 # ifdef KBUILD_OS_WINDOWS
                 HANDLE hProcess = INVALID_HANDLE_VALUE;
-                rcExit = kRedirectCreateProcessWindows(pszExecutable, cArgs, papszArgs, papszEnvVars, pszCwd,
-                                                       cOrders, paOrders, &hProcess);
+                rcExit = kRedirectCreateProcessWindows(pszExecutable, cArgs, papszArgs, papszEnvVars,
+                                                       pszSavedCwd ? pszCwd : NULL, cOrders, paOrders, &hProcess);
                 if (rcExit == 0)
                 {
@@ -1348 +1349 @@
     char          **papszEnvVars       = NULL;
     unsigned        cAllocatedEnvVars;
-    unsigned        iEnvVar;
     unsigned        cEnvVars;
     int             fWatcomBrainDamage = 0;
@@ -1378 +1378 @@
         return err(9, "getcwd failed");
 
-#if defined(KMK)
-    /* We get it from kmk and just count it:  */
-    papszEnvVars = pChild->environment;
-    if (!papszEnvVars)
-        pChild->environment = papszEnvVars = target_environment(pChild->file);
+    /* We start out with a read-only enviornment from kmk or the crt, and will
+       duplicate it if we make changes to it. */
+    cAllocatedEnvVars = 0;
+    papszEnvVars = envp;
     cEnvVars = 0;
     while (papszEnvVars[cEnvVars] != NULL)
         cEnvVars++;
-    cAllocatedEnvVars = cEnvVars;
-#else
-    /* We make a copy and we manage ourselves: */
-    cEnvVars = 0;
-    while (envp[cEnvVars] != NULL)
-        cEnvVars++;
-
-    cAllocatedEnvVars = cEnvVars + 4;
-    papszEnvVars = malloc((cAllocatedEnvVars + 1) * sizeof(papszEnvVars));
-    if (!papszEnvVars)
-        return errx(9, "out of memory!");
-
-    iEnvVar = cEnvVars;
-    papszEnvVars[iEnvVar] = NULL;
-    while (iEnvVar-- > 0)
-    {
-        papszEnvVars[iEnvVar] = strdup(envp[iEnvVar]);
-        if (!papszEnvVars[iEnvVar])
-        {
-            while (iEnvVar-- > 0)
-                free(papszEnvVars[iEnvVar]);
-            free(papszEnvVars);
-            return errx(9, "out of memory!");
-        }
-    }
-#endif
 
 #ifdef USE_POSIX_SPAWN
@@ -1578 +1551 @@
                 {
                     if (pchEqual[1] != '\0')
-                    {
                         rcExit = kBuiltinOptEnvSet(&papszEnvVars, &cEnvVars, &cAllocatedEnvVars, cVerbosity, pszValue);
-#ifdef KMK
-                        pChild->environment = papszEnvVars;
-#endif
-                    }
                     else
                     {
@@ -1590 +1558 @@
                         {
                             pszCopy[pchEqual - pszValue] = '\0';
-                            rcExit = kBuiltinOptEnvUnset(papszEnvVars, &cEnvVars, cVerbosity, pszCopy);
+                            rcExit = kBuiltinOptEnvUnset(&papszEnvVars, &cEnvVars, &cAllocatedEnvVars, cVerbosity, pszCopy);
                             free(pszCopy);
                         }
@@ -1633 +1601 @@
                 else
 #endif
-                    rcExit = kBuiltinOptEnvUnset(papszEnvVars, &cEnvVars, cVerbosity, pszValue);
+                    rcExit = kBuiltinOptEnvUnset(&papszEnvVars, &cEnvVars, &cAllocatedEnvVars, cVerbosity, pszValue);
                 continue;
             }
@@ -1643 +1611 @@
                 || chOpt == 'i' /* GNU env compatibility. */ )
             {
-                for (iEnvVar = 0; iEnvVar < cEnvVars; iEnvVar++)
-                    free(papszEnvVars[iEnvVar]);
-                papszEnvVars[0] = NULL;
-                cEnvVars = 0;
+                rcExit = kBuiltinOptEnvZap(&papszEnvVars, &cEnvVars, &cAllocatedEnvVars, cVerbosity);
                 continue;
             }
@@ -1998 +1963 @@
      * Cleanup.
      */
+    kBuiltinOptEnvCleanup(&papszEnvVars, cEnvVars, &cAllocatedEnvVars);
     if (pszSavedCwd)
         free(pszSavedCwd);
@@ -2004 +1970 @@
     posix_spawn_file_actions_destroy(&FileActions);
 #endif
-#ifndef KMK
-    iEnvVar = cEnvVars;
-    while (iEnvVar-- > 0)
-        free(papszEnvVars[iEnvVar]);
-    free(papszEnvVars);
-#endif
 #ifdef KBUILD_OS_OS2
     for (ulLibPath = 0; ulLibPath < K_ELEMENTS(apszSavedLibPaths); ulLibPath++)