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

Timestamp:

Aug 25, 2016 9:46:44 PM (9 years ago)

Author:

bird

Message:

kWorker: A little more hacking.

File:

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

trunk/src/kmk/kmkbuiltin/redirect.c

@@ -41 +41 @@
 # include <direct.h>
 # include <process.h>
+# include "quote_argv.h"
 #else
 # include <unistd.h>
@@ -62 +63 @@
 
 #if defined(_MSC_VER)
-
-/**
- * Checks if this is an Watcom option where we must just pass thru the string
- * as-is.
- *
- * This is currnetly only used for -d (defining macros).
- *
- * @returns 1 if pass-thru, 0 if not.
- * @param   pszArg          The argument to consider.
- */
-static int isWatcomPassThruOption(const char *pszArg)
-{
-    char ch = *pszArg++;
-    if (ch != '-' && ch != '/')
-        return 0;
-    ch = *pszArg++;
-    switch (ch)
-    {
-        /* Example: -d+VAR="string-value" */
-        case 'd':
-            if (ch == '+')
-                ch = *pszArg++;
-            if (!isalpha(ch) && ch != '_')
-                return 0;
-            return 1;
-
-        default:
-            return 0;
-    }
-}
-
-
-/**
- * Replaces arguments in need of quoting.
- *
- * This will "leak" the original and/or the replacement string, depending on
- * how you look at it.
- *
- * For details on how MSC parses the command line, see "Parsing C Command-Line
- * Arguments": http://msdn.microsoft.com/en-us/library/a1y7w461.aspx
- *
- * @param   argc                The argument count.
- * @param   argv                The argument vector.
- * @param   fWatcomBrainDamage  Set if we're catering for wcc, wcc386 or similar
- *                              OpenWatcom tools.  They seem to follow some
- *                              ancient or home made quoting convention.
- * @param   pStdErr             For verbose debug info.
- */
-static void quoteArguments(int argc, char **argv, int fWatcomBrainDamage, FILE *pStdErr)
-{
-    int i;
-    for (i = 0; i < argc; i++)
-    {
-        const char *pszOrgOrg = argv[i];
-        const char *pszOrg    = pszOrgOrg;
-        size_t      cchOrg    = strlen(pszOrg);
-        const char *pszQuotes = (const char *)memchr(pszOrg, '"', cchOrg);
-        const char *pszProblem = NULL;
-        if (   pszQuotes
-            || cchOrg == 0
-            || (pszProblem = (const char *)memchr(pszOrg, ' ',  cchOrg)) != NULL
-            || (pszProblem = (const char *)memchr(pszOrg, '\t', cchOrg)) != NULL
-            || (pszProblem = (const char *)memchr(pszOrg, '\n', cchOrg)) != NULL
-            || (pszProblem = (const char *)memchr(pszOrg, '\r', cchOrg)) != NULL
-            || (pszProblem = (const char *)memchr(pszOrg, '&',  cchOrg)) != NULL
-            || (pszProblem = (const char *)memchr(pszOrg, '>',  cchOrg)) != NULL
-            || (pszProblem = (const char *)memchr(pszOrg, '<',  cchOrg)) != NULL
-            || (pszProblem = (const char *)memchr(pszOrg, '|',  cchOrg)) != NULL
-            || (pszProblem = (const char *)memchr(pszOrg, '%',  cchOrg)) != NULL
-            || (pszProblem = (const char *)memchr(pszOrg, '\'', cchOrg)) != NULL
-            || (   !fWatcomBrainDamage
-                && (pszProblem = (const char *)memchr(pszOrg, '=',  cchOrg)) != NULL)
-            )
-        {
-            char   ch;
-            int    fComplicated = pszQuotes || (cchOrg > 0 && pszOrg[cchOrg - 1] == '\\');
-            size_t cchNew       = fComplicated ? cchOrg * 2 + 2 : cchOrg + 2;
-            char  *pszNew       = (char *)malloc(cchNew + 1 /*term*/ + 3 /*passthru hack*/);
-
-            argv[i] = pszNew;
-
-            /* Watcom does not grok stuff like "-i=c:\program files\watcom\h",
-               it think it's a source specification. In that case the quote
-               must follow the equal sign. */
-            if (fWatcomBrainDamage)
-            {
-                size_t cchUnquoted  = 0;
-                if (pszOrg[0] == '@') /* Response file quoting: @"file name.rsp" */
-                    cchUnquoted = 1;
-                else if (pszOrg[0] == '-' || pszOrg[0] == '/') /* Switch quoting. */
-                {
-                    if (isWatcomPassThruOption(pszOrg))
-                        cchUnquoted = strlen(pszOrg) + 1;
-                    else
-                    {
-                        const char *pszNeedQuoting = (const char *)memchr(pszOrg, '=', cchOrg); /* For -i=dir and similar. */
-                        if (   pszNeedQuoting == NULL
-                            || (uintptr_t)pszNeedQuoting > (uintptr_t)(pszProblem ? pszProblem : pszQuotes))
-                            pszNeedQuoting = pszProblem ? pszProblem : pszQuotes;
-                        else
-                            pszNeedQuoting++;
-                        cchUnquoted = pszNeedQuoting - pszOrg;
-                    }
-                }
-                if (cchUnquoted)
-                {
-                    memcpy(pszNew, pszOrg, cchUnquoted);
-                    pszNew += cchUnquoted;
-                    pszOrg += cchUnquoted;
-                    cchOrg -= cchUnquoted;
-                }
-            }
-
-            *pszNew++ = '"';
-            if (fComplicated)
-            {
-                while ((ch = *pszOrg++) != '\0')
-                {
-                    if (ch == '"')
-                    {
-                        *pszNew++ = '\\';
-                        *pszNew++ = '"';
-                    }
-                    else if (ch == '\\')
-                    {
-                        /* Backslashes are a bit complicated, they depends on
-                           whether a quotation mark follows them or not.  They
-                           only require escaping if one does. */
-                        unsigned cSlashes = 1;
-                        while ((ch = *pszOrg) == '\\')
-                        {
-                            pszOrg++;
-                            cSlashes++;
-                        }
-                        if (ch == '"' || ch == '\0') /* We put a " at the EOS. */
-                        {
-                            while (cSlashes-- > 0)
-                            {
-                                *pszNew++ = '\\';
-                                *pszNew++ = '\\';
-                            }
-                        }
-                        else
-                            while (cSlashes-- > 0)
-                                *pszNew++ = '\\';
-                    }
-                    else
-                        *pszNew++ = ch;
-                }
-            }
-            else
-            {
-                memcpy(pszNew, pszOrg, cchOrg);
-                pszNew += cchOrg;
-            }
-            *pszNew++ = '"';
-            *pszNew = '\0';
-        }
-
-        if (g_cVerbosity > 0)
-        {
-            if (argv[i] == pszOrgOrg)
-                fprintf(pStdErr, "kmk_redirect: debug: argv[%i]=%s<eos>\n", i, pszOrgOrg);
-            else
-            {
-                fprintf(pStdErr, "kmk_redirect: debug: argv[%i]=%s<eos>\n", i, argv[i]);
-                fprintf(pStdErr, "kmk_redirect: debug:(orig[%i]=%s<eos>)\n", i, pszOrgOrg);
-            }
-        }
-    }
-
-    /*for (i = 0; i < argc; i++) fprintf(stderr, "argv[%u]=%s;;\n", i, argv[i]);*/
-}
 
 
@@ -318 +146 @@
 {
     int i;
+    int j;
 #if defined(_MSC_VER)
     intptr_t rc;
-#else
-    int j;
 #endif
     FILE *pStdErr = stderr;
@@ -824 +651 @@
 
     /* MSC is a PITA since it refuses to quote the arguments... */
-    quoteArguments(argc - i, &argv[i], fWatcomBrainDamage, pStdErr);
+    quote_argv(argc - i, &argv[i], fWatcomBrainDamage, 0 /*fFreeOrLeak*/);
+    if (g_cVerbosity > 0)
+        for (j = i; j < argc; j++)
+            fprintf(pStdErr, "kmk_redirect: debug: argv[%i]=%s<eos>\n", j - i, argv[j]);
     rc = _spawnvp(_P_WAIT, argv[i], &argv[i]);
     if (rc == -1 && pStdErr)