Changeset 3205 in kBuild for trunk/src/kmk

Timestamp:

Mar 29, 2018 12:42:24 AM (7 years ago)

Author:

bird

Message:

kmk/winchildren.c: Fixed argv -> cmdline conversion bug.

File:

• trunk/src/kmk/w32/winchildren.c (modified) (4 diffs)

trunk/src/kmk/w32/winchildren.c

@@ -1438 +1438 @@
                         case '"':
                             if (fFlags & (MKWCCWCMD_F_CYGWIN_SHELL | MKWCCWCMD_F_MKS_SHELL))
-                                cwcDstExtra += 1;
+                                cwcDstExtra += 1; /* just an extra '"' */
                             else
-                                cwcDstExtra += 1 + cBackslashes;
+                                cwcDstExtra += 1 + cBackslashes; /* extra '\\' for the '"' and for each preceeding slash. */
+                            cBackslashes = 0;
                             break;
 
@@ -1455 +1456 @@
                 }
 
+                /* If we're quoting the argument and it ends with trailing '\\', it/they must be escaped. */
                 if (   cBackslashes > 0
                     && paArgInfo[i].fQuoteIt
@@ -1507 +1509 @@
             /* Do the conversion into the end of the output buffer, then move
                it up to where it should be char by char.  */
-            size_t          cBackslashes;
+            int             cBackslashes;
             size_t          cwcLeft     = paArgInfo[i].cwcDst - paArgInfo[i].cwcDstExtra;
             WCHAR volatile *pwchSlowSrc = pwszDst + paArgInfo[i].cwcDstExtra;
@@ -1525 +1527 @@
                 else if (   (fFlags & (MKWCCWCMD_F_CYGWIN_SHELL | MKWCCWCMD_F_HAVE_SH))
                          ==           (MKWCCWCMD_F_CYGWIN_SHELL | MKWCCWCMD_F_HAVE_SH))
+                {
                     *pwchSlowDst++ = L'"'; /* cygwin: '"' instead of '\\', no escaped slashes. */
+                    cBackslashes = 0;
+                }
                 else
                 {
                     if (!(fFlags & (MKWCCWCMD_F_CYGWIN_SHELL | MKWCCWCMD_F_MKS_SHELL)))
-                        cBackslashes = 1;
-                    while (cBackslashes-- > 0)
+                        cBackslashes += 1; /* one extra escape the '"' and one for each preceeding slash. */
+                    while (cBackslashes > 0)
+                    {
                         *pwchSlowDst++ = L'\\';
+                        cBackslashes--;
+                    }
                 }
                 *pwchSlowDst++ = wcSrc;
+                assert((uintptr_t)pwchSlowDst <= (uintptr_t)pwchSlowSrc);
             }