ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmd: Avoid using strstr to match == operator in WCMD_if.

This commit is contained in:
Frédéric Delanoy 2012-10-25 23:48:01 +02:00 committed by Alexandre Julliard
parent dd13954424
commit 17607b8020
1 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
programs/cmd/builtins.c
View File

@ -2350,7 +2350,7 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList)
{ {
int negate; /* Negate condition */ int negate; /* Negate condition */
int test; /* Condition evaluation result */ int test; /* Condition evaluation result */
WCHAR condition[MAX_PATH], *command, *s; WCHAR condition[MAX_PATH], *command;
static const WCHAR notW[] = {'n','o','t','\0'}; static const WCHAR notW[] = {'n','o','t','\0'};
static const WCHAR errlvlW[] = {'e','r','r','o','r','l','e','v','e','l','\0'}; static const WCHAR errlvlW[] = {'e','r','r','o','r','l','e','v','e','l','\0'};
static const WCHAR existW[] = {'e','x','i','s','t','\0'}; static const WCHAR existW[] = {'e','x','i','s','t','\0'};
@ -2381,23 +2381,35 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList)
NULL, 0) > 0); NULL, 0) > 0);
WCMD_parameter(p, 2+negate, &command, FALSE, FALSE); WCMD_parameter(p, 2+negate, &command, FALSE, FALSE);
} }
else if ((s = strstrW (p, eqeqW))) { else { /* comparison operation */
/* We need to get potential surrounding double quotes, so param1/2 can't be used */ WCHAR leftOperand[MAXSTRING], rightOperand[MAXSTRING], operator[MAXSTRING];
WCHAR *leftPart, *rightPart; WCHAR *paramStart;
unsigned int leftPartLen, rightPartLen;
s += 2; strcpyW(leftOperand, WCMD_parameter(p, negate+caseInsensitive, &paramStart, TRUE, FALSE));
leftPartLen = strlenW(WCMD_parameter(p, 0+negate+caseInsensitive, &leftPart, TRUE, FALSE)); if (!*leftOperand)
rightPartLen = strlenW(WCMD_parameter(p, 1+negate+caseInsensitive, &rightPart, TRUE, FALSE)); goto syntax_err;
test = caseInsensitive
? (CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, /* Note: '==' can't be returned by WCMD_parameter since '=' is a separator */
leftPart, leftPartLen, p = paramStart + strlenW(leftOperand);
rightPart, rightPartLen) == CSTR_EQUAL) while (*p == ' ' || *p == '\t')
: (CompareStringW(LOCALE_SYSTEM_DEFAULT, 0, p++;
leftPart, leftPartLen,
rightPart, rightPartLen) == CSTR_EQUAL); if (strncmpW(p, eqeqW, strlenW(eqeqW)))
WCMD_parameter(s, 1, &command, FALSE, FALSE); goto syntax_err;
strcpyW(operator, eqeqW);
p += strlenW(operator);
strcpyW(rightOperand, WCMD_parameter(p, 0, &paramStart, TRUE, FALSE));
if (!*rightOperand)
goto syntax_err;
test = caseInsensitive ? lstrcmpiW(leftOperand, rightOperand) == 0
: lstrcmpW (leftOperand, rightOperand) == 0;
p = paramStart + strlenW(rightOperand);
WCMD_parameter(p, 0, &command, FALSE, FALSE);
} }
else goto syntax_err;
/* Process rest of IF statement which is on the same line /* Process rest of IF statement which is on the same line
Note: This may process all or some of the cmdList (eg a GOTO) */ Note: This may process all or some of the cmdList (eg a GOTO) */