Changeset 3039 for trunk/src/kmk/kmkbuiltin/kSubmit.c

Timestamp:

May 10, 2017, 12:55:51 PM (8 years ago)

Author:

bird

Message:

kmk_redirect,kmk_kSubmit: Added --append <var=value> and --prepend <var=value> options for modifying the environment (e.g. PATH).

File:

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

trunk/src/kmk/kmkbuiltin/kSubmit.c

@@ -1169 +1169 @@
     fprintf(pOut,
             "usage: %s [-Z|--zap-env] [-E|--set <var=val>] [-U|--unset <var=val>]\n"
+            "           [-A|--append <var=val>] [-D|--prepend <var=val>]\n"
             "           [-C|--chdir <dir>] [--wcc-brain-damage] [--no-pch-caching]\n"
             "           [-3|--32-bit] [-6|--64-bit] [-v]\n"
@@ -1182 +1183 @@
             "  -U, --unset <var>\n"
             "    Removes an environment variable. Position dependent.\n"
+            "  -A, --append <var>=<value>\n"
+            "    Appends the given value to the environment variable.\n"
+            "  -D,--prepend <var>=<value>\n"
+            "    Prepends the given value to the environment variable.\n"
             "  -C, --chdir <dir>\n"
             "    Specifies the current directory for the program.  Relative paths\n"
@@ -1296 +1301 @@
                 else if (strcmp(pszArg, "set") == 0)
                     chOpt = 'E';
+                else if (strcmp(pszArg, "append") == 0)
+                    chOpt = 'A';
+                else if (strcmp(pszArg, "prepend") == 0)
+                    chOpt = 'D';
                 else if (strcmp(pszArg, "unset") == 0)
                     chOpt = 'U';
@@ -1327 +1336 @@
                 switch (chOpt)
                 {
+                    case 'A':
+                    case 'C':
                     case 'E':
                     case 'U':
-                    case 'C':
+                    case 'D':
                     case 'e':
                         if (*pszArg != '\0')
@@ -1355 +1366 @@
                     case 'E':
                         rcExit = kBuiltinOptEnvSet(&papszEnv, &cEnvVars, &cAllocatedEnvVars, cVerbosity, pszValue);
+                        pChild->environment = papszEnv;
+                        if (rcExit == 0)
+                            break;
+                        return rcExit;
+
+                    case 'A':
+                        rcExit = kBuiltinOptEnvAppend(&papszEnv, &cEnvVars, &cAllocatedEnvVars, cVerbosity, pszValue);
+                        pChild->environment = papszEnv;
+                        if (rcExit == 0)
+                            break;
+                        return rcExit;
+
+                    case 'D':
+                        rcExit = kBuiltinOptEnvPrepend(&papszEnv, &cEnvVars, &cAllocatedEnvVars, cVerbosity, pszValue);
                         pChild->environment = papszEnv;
                         if (rcExit == 0)