Changeset 1308 in kBuild

Timestamp:

Dec 2, 2007 2:05:11 AM (17 years ago)

Author:

bird

Message:

Added two new options: -C <dir> and -E var=val.

File:

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

trunk/src/kmk/kmkbuiltin/redirect.c

@@ -47 +47 @@
 {
     fprintf(pOut,
-            "usage: %s [-[rwa+tb]<fd>[=|:| ]<file>] -- <program> [args]\n"
+            "usage: %s [-[rwa+tb]<fd> <file>] [-E <var=val>] [-C <dir>] -- <program> [args]\n"
             "   or: %s --help\n"
             "   or: %s --version\n"
@@ -56 +56 @@
             "   o = stdout\n"
             "   e = stderr\n"
+            "\n"
+            "The -E switch is for making changes to the environment in a putenv\n"
+            "fashion.\n"
+            "\n"
+            "The -C switch is for changing the current directory. This takes immediate\n"
+            "effect, so be careful where you put it.\n"
             "\n"
             "This command is really just a quick hack to avoid invoking the shell\n"
@@ -103 +109 @@
                 else if (!strcmp(psz, "-version"))
                     psz = "V";
+                else if (!strcmp(psz, "-env"))
+                    psz = "E";
+                else if (!strcmp(psz, "-chdir"))
+                    psz = "C";
             }
 
@@ -119 +129 @@
                        KBUILD_VERSION_MAJOR, KBUILD_VERSION_MINOR, KBUILD_VERSION_PATCH);
                 return 0;
+            }
+
+            /*
+             * Environment switch?
+             */
+            if (*psz == 'E')
+            {
+                psz++;
+                if (*psz == ':' || *psz == '=')
+                    psz++;
+                else
+                {
+                    if (i + 1 >= argc)
+                    {
+                        fprintf(pStdErr, "%s: syntax error: no argument for %s\n", argv[0], argv[i]);
+                        return 1;
+                    }
+                    psz = argv[++i];
+                }
+                if (putenv(psz))
+                {
+                    fprintf(pStdErr, "%s: error: putenv(\"%s\"): %s\n", argv[0], psz, strerror(errno));
+                    return 1;
+                }
+                continue;
+            }
+
+            /*
+             * Change directory switch?
+             */
+            if (*psz == 'C')
+            {
+                psz++;
+                if (*psz == ':' || *psz == '=')
+                    psz++;
+                else
+                {
+                    if (i + 1 >= argc)
+                    {
+                        fprintf(pStdErr, "%s: syntax error: no argument for %s\n", argv[0], argv[i]);
+                        return 1;
+                    }
+                    psz = argv[++i];
+                }
+                if (!chdir(psz))
+                    continue;
+#ifdef _MSC_VER
+                {
+                    /* drop trailing slash if any. */
+                    size_t cch = strlen(psz);
+                    if (    cch > 2
+                        &&  (psz[cch - 1] == '/' || psz[cch - 1] == '\\')
+                        &&  psz[cch - 1] != ':')
+                    {
+                        int rc2;
+                        char *pszCopy = strdup(psz);
+                        do  pszCopy[--cch] = '\0';
+                        while (    cch > 2
+                               &&  (pszCopy[cch - 1] == '/' || pszCopy[cch - 1] == '\\')
+                               &&  pszCopy[cch - 1] != ':');
+                        rc2 = chdir(pszCopy);
+                        free(pszCopy);
+                        if (!rc2)
+                            continue;
+                    }
+                }
+#endif
+                fprintf(pStdErr, "%s: error: chdir(\"%s\"): %s\n", argv[0], psz, strerror(errno));
+                return 1;
             }