[PATCH 6/9] cmd: fix handling of special characters in command line

Martin Wilck mwilck at arcor.de
Mon Sep 19 18:51:16 CDT 2011


A semicolon must be treated as parameter separator (like comma).
An opening parenthesis ends a command name but is legal in parameters.
---
 programs/cmd/wcmdmain.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index 9a1d0d8..12e2580 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -915,7 +915,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++;
@@ -924,7 +925,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



More information about the wine-patches mailing list