Changeset 2875

Timestamp:

Sep 4, 2016, 10:09:43 PM (9 years ago)

Author:

bird

Message:

Fixes.

File:

• trunk/src/kmk/kmkbuiltin/kSubmit.c (modified) (7 diffs)

trunk/src/kmk/kmkbuiltin/kSubmit.c

@@ -1141 +1141 @@
  * @param   pszValue            The var=value string to apply.
  */
-static int kSubmitOptEnvSet(char **papszEnv, unsigned *pcEnvVars, unsigned *pcAllocatedEnvVars,
+static int kSubmitOptEnvSet(char ***ppapszEnv, unsigned *pcEnvVars, unsigned *pcAllocatedEnvVars,
                             int cVerbosity, const char *pszValue)
 {
@@ -1147 +1147 @@
     if (pszEqual)
     {
+        char   **papszEnv = *ppapszEnv;
         unsigned iEnvVar;
         unsigned cEnvVars = *pcEnvVars;
@@ -1166 +1167 @@
             {
                 *pcAllocatedEnvVars = (cEnvVars + 2 + 0xf) & ~(unsigned)0xf;
-                papszEnv = (char **)xrealloc(papszEnv, *pcAllocatedEnvVars * sizeof(papszEnv[0]));
+                *ppapszEnv = papszEnv = (char **)xrealloc(papszEnv, *pcAllocatedEnvVars * sizeof(papszEnv[0]));
             }
             papszEnv[cEnvVars++] = xstrdup(pszValue);
@@ -1397 +1398 @@
         {
             char chOpt = *++pszArg;
+            pszArg++;
             if (chOpt != '-')
             {
@@ -1409 +1411 @@
             else
             {
-                pszArg++;
-
                 /* '--' indicates where the bits to execute start. */
                 if (*pszArg == '\0')
@@ -1418 +1418 @@
                 }
 
-                if (strcmp(pszArg, "watcom-brain-damage") == 0)
+                if (   strcmp(pszArg, "wcc-brain-damage") == 0
+                    || strcmp(pszArg, "watcom-brain-damage") == 0)
                 {
                     fWatcomBrainDamage = 1;
@@ -1487 +1488 @@
 
                     case 'E':
-                        rcExit = kSubmitOptEnvSet(papszEnv, &cEnvVars, &cAllocatedEnvVars, cVerbosity, pszValue);
+                        rcExit = kSubmitOptEnvSet(&papszEnv, &cEnvVars, &cAllocatedEnvVars, cVerbosity, pszValue);
                         pChild->environment = papszEnv;
                         if (rcExit == 0)