commit a7c5906b626fd17de661dc8e12fab71e79c6e1ad
author Jason Edmeades <us@edmeades.me.uk> Tue Feb 27 23:21:59 2007 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Feb 28 14:29:18 2007 +0100
tree 2740d48cd6e8783e855d6435f04f20c08a348a3f
parent b822e73263c0f9ed3c6c8588b4dd6dc093aea27d

cmd.exe: Fix parameter parsing returns.

Only return valid values for the location of the parameter if it is
the one requested. Currently returns address when ANY quoted or
bracketed parameter found.

programs/cmd/batch.c

diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c
index 5a854f7..bbc3f83 100644
--- a/programs/cmd/batch.c
+++ b/programs/cmd/batch.c
@@ -147,6 +147,7 @@
 static char param[MAX_PATH];
 char *p;
 
+  if (where != NULL) *where = NULL;
   p = param;
   while (TRUE) {
     switch (*s) {
@@ -154,7 +155,7 @@
 	s++;
 	break;
       case '"':
-        if (where != NULL) *where = s;
+        if (where != NULL && i==n) *where = s;
 	s++;
 	while ((*s != '\0') && (*s != '"')) {
 	  *p++ = *s++;
@@ -169,7 +170,7 @@
         p = param;
 	break;
       case '(':
-        if (where != NULL) *where = s;
+        if (where != NULL && i==n) *where = s;
 	s++;
 	while ((*s != '\0') && (*s != ')')) {
 	  *p++ = *s++;