Module: wine Branch: master Commit: 766f6b0b4b153e8262591a52e123e63b0f7c2f01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=766f6b0b4b153e8262591a52e1...
Author: Martin Wilck Martin.Wilck@particle-dynamics.de Date: Wed Oct 27 01:49:06 2010 +0200
xcopy: Fix command line parsing logic.
Experiments show xcopy under Windows does not use argc/argv logic for treating double quotes and backslashes. The xcopy logic is simplified because literal quotes are illegal in Windows file names, thus escaped double quotes (") need not be treated. 'XCOPY "c:\dir a" "c:\dir b"' works under Windows.
---
programs/xcopy/xcopy.c | 142 +++++++++++++++++++++++++++++++++++------------- 1 files changed, 103 insertions(+), 39 deletions(-)
diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index ed736db..9e931c0 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -49,9 +49,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(xcopy);
/* Prototypes */ -static int XCOPY_ParseCommandLine(int argc, WCHAR **argvW, - WCHAR *suppliedsource, - WCHAR *supplieddestination, DWORD *flags); +static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, + WCHAR *supplieddestination, DWORD *flags); static int XCOPY_ProcessSourceParm(WCHAR *suppliedsource, WCHAR *stem, WCHAR *spec, DWORD flags); static int XCOPY_ProcessDestParm(WCHAR *supplieddestination, WCHAR *stem, @@ -130,12 +129,12 @@ int wmain (int argc, WCHAR *argvW[]) /* * Parse the command line */ - if ((rc = XCOPY_ParseCommandLine(argc, argvW, suppliedsource, - supplieddestination, &flags)) != RC_OK) { - if (rc == RC_HELP) - return RC_OK; - else - return rc; + if ((rc = XCOPY_ParseCommandLine(suppliedsource, supplieddestination, + &flags)) != RC_OK) { + if (rc == RC_HELP) + return RC_OK; + else + return rc; }
/* Trace out the supplied information */ @@ -196,43 +195,102 @@ int wmain (int argc, WCHAR *argvW[]) /* ========================================================================= XCOPY_ParseCommandLine - Parses the command line ========================================================================= */ -static int XCOPY_ParseCommandLine(int argc, WCHAR **argvW, - WCHAR *suppliedsource, - WCHAR *supplieddestination, DWORD *pflags) +static BOOL is_whitespace(WCHAR c) +{ + return c == ' ' || c == '\t'; +} + +static WCHAR *skip_whitespace(WCHAR *p) +{ + for (; *p && is_whitespace(*p); p++); + return p; +} + +/* Windows XCOPY uses a simplified command line parsing algorithm + that lacks the escaped-quote logic of build_argv(), because + literal double quotes are illegal in any of its arguments. + Example: 'XCOPY "c:\DIR A" "c:DIR B"' is OK. */ +static int find_end_of_word(const WCHAR *word, WCHAR **end) +{ + BOOL in_quotes = 0; + const WCHAR *ptr = word; + for (;;) { + for (; *ptr != '\0' && *ptr != '"' && + (in_quotes || !is_whitespace(*ptr)); ptr++); + if (*ptr == '"') { + in_quotes = !in_quotes; + ptr++; + } + /* Odd number of double quotes is illegal for XCOPY */ + if (in_quotes && *ptr == '\0') + return RC_INITERROR; + if (*ptr == '\0' || (!in_quotes && is_whitespace(*ptr))) + break; + } + *end = (WCHAR*)ptr; + return RC_OK; +} + +/* Remove all double quotes from a word */ +static void strip_quotes(WCHAR *word, WCHAR **end) +{ + WCHAR *rp, *wp; + for (rp = word, wp = word; *rp != '\0'; rp++) { + if (*rp == '"') + continue; + if (wp < rp) + *wp = *rp; + wp++; + } + *wp = '\0'; + *end = wp; +} + +static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, + WCHAR *supplieddestination, DWORD *pflags) { const WCHAR EXCLUDE[] = {'E', 'X', 'C', 'L', 'U', 'D', 'E', ':', 0}; DWORD flags = *pflags; + WCHAR *cmdline, *word, *end, *next; + int rc = RC_INITERROR;
- /* Confirm at least one parameter */ - if (argc < 2) { - XCOPY_wprintf(XCOPY_LoadMessage(STRING_INVPARMS)); - return RC_INITERROR; - } + cmdline = _wcsdup(GetCommandLineW()); + if (cmdline == NULL) + return rc;
/* Skip first arg, which is the program name */ - argvW++; + if ((rc = find_end_of_word(cmdline, &word)) != RC_OK) + goto out; + word = skip_whitespace(word);
- while (argc > 1) + while (*word) { - argc--; - WINE_TRACE("Processing Arg: '%s'\n", wine_dbgstr_w(*argvW)); + WCHAR first; + if ((rc = find_end_of_word(word, &end)) != RC_OK) + goto out; + + next = skip_whitespace(end); + first = word[0]; + *end = '\0'; + strip_quotes(word, &end); + WINE_TRACE("Processing Arg: '%s'\n", wine_dbgstr_w(word));
/* First non-switch parameter is source, second is destination */ - if (*argvW[0] != '/') { + if (first != '/') { if (suppliedsource[0] == 0x00) { - lstrcpyW(suppliedsource, *argvW); + lstrcpyW(suppliedsource, word); } else if (supplieddestination[0] == 0x00) { - lstrcpyW(supplieddestination, *argvW); + lstrcpyW(supplieddestination, word); } else { XCOPY_wprintf(XCOPY_LoadMessage(STRING_INVPARMS)); - return RC_INITERROR; + goto out; } } else { /* Process all the switch options Note: Windows docs say /P prompts when dest is created but tests show it is done for each src file regardless of the destination */ - switch (toupper(argvW[0][1])) { + switch (toupper(word[1])) { case 'I': flags |= OPT_ASSUMEDIR; break; case 'S': flags |= OPT_RECURSIVE; break; case 'Q': flags |= OPT_QUIET; break; @@ -254,19 +312,19 @@ static int XCOPY_ParseCommandLine(int argc, WCHAR **argvW, /* E can be /E or /EXCLUDE */ case 'E': if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - &argvW[0][1], 8, + &word[1], 8, EXCLUDE, -1) == 2) { - if (XCOPY_ProcessExcludeList(&argvW[0][9])) { + if (XCOPY_ProcessExcludeList(&word[9])) { XCOPY_FailMessage(ERROR_INVALID_PARAMETER); - return RC_INITERROR; + goto out; } else flags |= OPT_EXCLUDELIST; } else flags |= OPT_EMPTYDIR | OPT_RECURSIVE; break;
/* D can be /D or /D: */ - case 'D': if ((argvW[0][2])==':' && isdigit(argvW[0][3])) { + case 'D': if (word[2]==':' && isdigit(word[3])) { SYSTEMTIME st; - WCHAR *pos = &argvW[0][3]; + WCHAR *pos = &word[3]; BOOL isError = FALSE; memset(&st, 0x00, sizeof(st));
@@ -285,6 +343,7 @@ static int XCOPY_ParseCommandLine(int argc, WCHAR **argvW, /* Parse the arg : Day */ if (!isError) { st.wYear = _wtol(pos); + while (*pos && isdigit(*pos)) pos++; if (st.wYear < 100) st.wYear+=2000; }
@@ -305,24 +364,25 @@ static int XCOPY_ParseCommandLine(int argc, WCHAR **argvW, wine_dbgstr_w(datestring), wine_dbgstr_w(timestring)); } else { XCOPY_FailMessage(ERROR_INVALID_PARAMETER); - return RC_INITERROR; + goto out; } } else { flags |= OPT_DATENEWER; } break;
- case '-': if (toupper(argvW[0][2])=='Y') + case '-': if (toupper(word[2])=='Y') flags &= ~OPT_NOPROMPT; break; case '?': XCOPY_wprintf(XCOPY_LoadMessage(STRING_HELP)); - return RC_HELP; + rc = RC_HELP; + goto out; default: - WINE_TRACE("Unhandled parameter '%s'\n", wine_dbgstr_w(*argvW)); - XCOPY_wprintf(XCOPY_LoadMessage(STRING_INVPARM), *argvW); - return RC_INITERROR; + WINE_TRACE("Unhandled parameter '%s'\n", wine_dbgstr_w(word)); + XCOPY_wprintf(XCOPY_LoadMessage(STRING_INVPARM), word); + goto out; } } - argvW++; + word = next; }
/* Default the destination if not supplied */ @@ -330,7 +390,11 @@ static int XCOPY_ParseCommandLine(int argc, WCHAR **argvW, lstrcpyW(supplieddestination, wchr_dot);
*pflags = flags; - return RC_OK; + rc = RC_OK; + + out: + free(cmdline); + return rc; }