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

cmd: Use a common function for the string parsing in for /f.

Browse Source
This commit is contained in:
Jason Edmeades 2012-10-22 00:53:30 +01:00 committed by Alexandre Julliard
parent 84ecf34c2c
commit a3688948d0
1 changed files with 55 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
programs/cmd/builtins.c
View File

@ -1676,6 +1676,54 @@ static void WCMD_add_dirstowalk(DIRECTORY_STACK *dirsToWalk) {
} }
} }
/**************************************************************************
* WCMD_parse_line
*
* When parsing file or string contents (for /f), once the string to parse
* hase been identified, handle the various options and call the do part
* if appropriate.
*
* Parameters:
* cmdStart [I] - Identifies the list of commands making up the
* for loop body (especially if brackets in use)
* firstCmd [I] - The textual start of the command after the DO
* which is within the first item of cmdStart
* cmdEnd [O] - Identifies where to continue after the DO
* variable [I] - The variable identified on the for line
* buffer [I] - The string to parse
* doExecuted [O] - Set to TRUE if the DO is ever executed once
* forf_skip [I/O] - How many lines to skip first
*/
static void WCMD_parse_line(CMD_LIST *cmdStart,
const WCHAR *firstCmd,
CMD_LIST **cmdEnd,
const WCHAR *variable,
WCHAR *buffer,
BOOL *doExecuted,
int *forf_skip) {
WCHAR *parm, *where;
/* Skip lines if requested */
if (*forf_skip) {
(*forf_skip)--;
return;
}
/* Extract the parameter */
parm = WCMD_parameter (buffer, 0, &where, NULL, FALSE, FALSE);
WINE_TRACE("Parsed parameter: %s from %s\n", wine_dbgstr_w(parm),
wine_dbgstr_w(buffer));
if (where) {
CMD_LIST *thisCmdStart = cmdStart;
*doExecuted = TRUE;
WCMD_part_execute(&thisCmdStart, firstCmd, variable, parm, FALSE, TRUE);
*cmdEnd = thisCmdStart;
}
}
/************************************************************************** /**************************************************************************
* WCMD_for * WCMD_for
* *
@ -1851,6 +1899,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) {
/* Loop through all entries on the same line */ /* Loop through all entries on the same line */
WCHAR *item; WCHAR *item;
WCHAR *itemStart; WCHAR *itemStart;
WCHAR buffer[MAXSTRING];
WINE_TRACE("Processing for set %p\n", thisSet); WINE_TRACE("Processing for set %p\n", thisSet);
i = 0; i = 0;
@ -1970,33 +2019,11 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) {
} else { } else {
WCHAR buffer[MAXSTRING]; WCHAR buffer[MAXSTRING];
WCHAR *where, *parm;
while (WCMD_fgets(buffer, sizeof(buffer)/sizeof(WCHAR), input)) { while (WCMD_fgets(buffer, sizeof(buffer)/sizeof(WCHAR), input)) {
WCMD_parse_line(cmdStart, firstCmd, &cmdEnd, variable, buffer, &doExecuted,
/* Skip lines if requested */ &forf_skip);
if (forf_skip) {
forf_skip--;
buffer[0] = 0; buffer[0] = 0;
continue;
}
/* Skip blank lines*/
parm = WCMD_parameter (buffer, 0, &where, NULL, FALSE, FALSE);
WINE_TRACE("Parsed parameter: %s from %s\n", wine_dbgstr_w(parm),
wine_dbgstr_w(buffer));
if (where) {
/* FIXME: The following should be moved into its own routine and
reused for the string literal parsing below */
thisCmdStart = cmdStart;
doExecuted = TRUE;
WCMD_part_execute(&thisCmdStart, firstCmd, variable, parm, FALSE, TRUE);
cmdEnd = thisCmdStart;
}
buffer[0] = 0;
} }
CloseHandle (input); CloseHandle (input);
} }
@ -2008,23 +2035,11 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) {
/* Filesets - A string literal */ /* Filesets - A string literal */
} else if (doFileset && *itemStart == '"') { } else if (doFileset && *itemStart == '"') {
WCHAR buffer[MAXSTRING];
WCHAR *where, *parm;
/* Skip blank lines, and re-extract parameter now string has quotes removed */ /* Copy the item away from the global buffer used by WCMD_parameter */
strcpyW(buffer, item); strcpyW(buffer, item);
parm = WCMD_parameter (buffer, 0, &where, NULL, FALSE, FALSE); WCMD_parse_line(cmdStart, firstCmd, &cmdEnd, variable, buffer, &doExecuted,
WINE_TRACE("Parsed parameter: %s from %s\n", wine_dbgstr_w(parm), &forf_skip);
wine_dbgstr_w(buffer));
if (where && forf_skip == 0) {
/* FIXME: The following should be moved into its own routine and
reused for the string literal parsing below */
thisCmdStart = cmdStart;
doExecuted = TRUE;
WCMD_part_execute(&thisCmdStart, firstCmd, variable, parm, FALSE, TRUE);
cmdEnd = thisCmdStart;
}
} }
WINE_TRACE("Post-command, cmdEnd = %p\n", cmdEnd); WINE_TRACE("Post-command, cmdEnd = %p\n", cmdEnd);