[PATCH 4/5] cmd: fix handling of special characters

[Martin Wilck]

Semicolon is a separator between parameters, too. An opening parenthesis ends a
command name (1st parameter) but is legal in other parameters.
---
 programs/cmd/tests/test_parsing.cmd.exp |    8 ++++----
 programs/cmd/wcmdmain.c                 |    7 +++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/programs/cmd/tests/test_parsing.cmd.exp b/programs/cmd/tests/test_parsing.cmd.exp
index 5c5219b..9ecd793 100644
--- a/programs/cmd/tests/test_parsing.cmd.exp
+++ b/programs/cmd/tests/test_parsing.cmd.exp
@@ -10,7 +10,7 @@
 0 at space@
 3 at space@
 3 at space@
- at todo_wine@4 at space@
+4 at space@
 ------ Testing invocation with CMD /C -------------
 0 at space@
 1 at space@
@@ -23,7 +23,7 @@
 0 at space@
 0 at space@
 3 at space@
- at todo_wine@4 at space@
+4 at space@
 ---------- Testing CMD /C quoting -----------------
 "hi"
 1 at space@
@@ -48,14 +48,14 @@ good
 good
 --------- Testing special characters --------------
 0 at space@
- at todo_wine@0 at space@
+0 at space@
 )@space@
 [@space@
 ]@space@
 {@space@
 }@space@
 0 at space@
- at todo_wine@0 at space@
+0 at space@
 !@space@
 '@space@
 + at space@
diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index 20fef0b..2527258 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -891,7 +891,8 @@ static void WCMD_parse (const WCHAR *s, WCHAR *q, WCHAR *p1, WCHAR *p2)
 	/* fall through to default case */
       default:
 	while ((*s != '\0') && (*s != ' ') && (*s != '\t')
-               && (*s != '=')  && (*s != ',') && (*s != '"')) {
+               && (*s != '=')  && (*s != ',') && (*s != '"') && (*s != ';')
+	       && (*s != '(' || p > 0)) {
 	  if (p == 0) *p1++ = *s++;
 	  else if (p == 1) *p2++ = *s++;
 	  else s++;
@@ -900,7 +901,9 @@ static void WCMD_parse (const WCHAR *s, WCHAR *q, WCHAR *p1, WCHAR *p2)
 	    /* opening quote - go back to '"' case */
 	    break;
         /* Skip concurrent parms */
-	while ((*s == ' ') || (*s == '\t') || (*s == '=')  || (*s == ',') ) s++;
+	while ((*s == ' ') || (*s == '\t') || (*s == '=')  || (*s == ',') 
+	       || (*s == ';'))
+	  s++;
 
         if (p == 0) *p1 = '\0';
         if (p == 1) *p2 = '\0';
-- 
1.7.3.4