cmd.exe: Fix parsing of && between quotes.

Signed-off-by: Francesco Noferi <lolisamurai@tfwno.gf> Signed-off-by: Myah Caron <qsniyg@protonmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

cmd.exe: Fix parsing of && between quotes.
fc1bb9af · Francesco Noferi · Alexandre Julliard · a26bb7b2 · fc1bb9af · fc1bb9af
Commit fc1bb9af authored Sep 11, 2020 by Francesco Noferi Committed by Alexandre Julliard Sep 11, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

test_cmdline.cmd programs/cmd/tests/test_cmdline.cmd +4 -0

test_cmdline.cmd.exp programs/cmd/tests/test_cmdline.cmd.exp +3 -0

wcmdmain.c programs/cmd/wcmdmain.c +2 -1

No files found.
--- a/programs/cmd/tests/test_cmdline.cmd
+++ b/programs/cmd/tests/test_cmdline.cmd
@@ -178,6 +178,10 @@ rem cond 5 - string between quotes must be name of executable
 cmd /c "say five"
 echo @echo 5 >"say five.bat"
 cmd /c "say five"
+rem cond 6 - && between quotes
+cd .&&"cmd.exe" /c "echo hi"
+cd "."&&cmd.exe /c "echo hi"
+cd "."&&"cmd.exe" /c "echo hi"
 echo ------- Testing CMD /C qualifier treatment ------------
 rem no need for space after /c

--- a/programs/cmd/tests/test_cmdline.cmd.exp
+++ b/programs/cmd/tests/test_cmdline.cmd.exp
@@ -87,6 +87,9 @@ Passed
 2@space@
 0@space@
 5@space@
+hi
+hi
+hi
 ------- Testing CMD /C qualifier treatment ------------
 0@space@
 1@space@

--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -1792,7 +1792,8 @@ static BOOL WCMD_IsEndQuote(const WCHAR *quote, int quoteIndex)
        /* Quote counting ends at EOL, redirection, space or pipe if current quote is complete */
        else if(((quoteCount % 2) == 0)
-            && ((quote[i] == '<') || (quote[i] == '>') || (quote[i] == '|') || (quote[i] == ' ')))
+            && ((quote[i] == '<') || (quote[i] == '>') || (quote[i] == '|') || (quote[i] == ' ') ||
+                (quote[i] == '&')))
        {
            break;
        }