system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmd.exe: Allow = and , to be delimiters.

Browse source
This commit is contained in:
Jason Edmeades 2007-09-11 21:43:04 +01:00 committed by Alexandre Julliard
parent b69241124e
commit 118f3a6592
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
programs/cmd/batch.c
View file

@ -134,7 +134,7 @@ void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HAN
/*******************************************************************
* WCMD_parameter - extract a parameter from a command line.
*
* Returns the 'n'th space-delimited parameter on the command line (zero-based).
* Returns the 'n'th delimited parameter on the command line (zero-based).
* Parameter is in static storage overwritten on the next call.
* Parameters in quotes (and brackets) are handled.
* Also returns a pointer to the location of the parameter in the command line.
@ -150,7 +150,7 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where) {
p = param;
while (TRUE) {
switch (*s) {
case ' ':
case ' ': /* Skip leading spaces */
s++;
break;
case '"':
@ -176,15 +176,20 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where) {
default:
/* Only return where if it is for the right parameter */
if (where != NULL && i==n) *where = s;
while ((*s != '\0') && (*s != ' ')) {
while ((*s != '\0') && (*s != ' ') && (*s != ',') && (*s != '=')) {
*p++ = *s++;
}
if (i == n) {
if (i == n && (p!=param)) {
*p = '\0';
return param;
}
/* Skip double delimiters, eg. dir a.a,,,,,b.b */
if (p != param) {
param[0] = '\0';
i++;
} else {
s++; /* Skip delimter */
}
p = param;
}
}