[PATCH v2 5/6] xcopy: Handle switch options concatenated with path.

[Piotr Caban]

From: Piotr Caban

---
 programs/xcopy/tests/xcopy.c |  2 +-
 programs/xcopy/xcopy.c       | 17 ++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/programs/xcopy/tests/xcopy.c b/programs/xcopy/tests/xcopy.c
index 2745ead97a5..4c51f941dfc 100644
--- a/programs/xcopy/tests/xcopy.c
+++ b/programs/xcopy/tests/xcopy.c
@@ -101,7 +101,7 @@ static void test_parms_syntax(void)
     ok(GetFileAttributesA("xcopytest2") == INVALID_FILE_ATTRIBUTES,
        "xcopy copied empty directory incorrectly\n");

-    rc = runcmd("xcopy /D/S/E xcopytest xcopytest2\");
+    rc = runcmd("xcopy xcopytest xcopytest2\/D/S/E");
     ok(rc == 0, "xcopy /D/S/E test failed rc=%lu\n", rc);
     ok(GetFileAttributesA("xcopytest2") != INVALID_FILE_ATTRIBUTES,
        "xcopy failed to copy empty directory\n");
diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c
index 715fd8f167b..84f2d312b6f 100644
--- a/programs/xcopy/xcopy.c
+++ b/programs/xcopy/xcopy.c
@@ -665,21 +665,16 @@ static inline BOOL is_digit(WCHAR c)
 static int get_arg(const WCHAR **cmdline, WCHAR **arg)
 {
     const WCHAR *ptr = *cmdline;
-    BOOL in_quotes = FALSE;
     int len;

-    for (;;) {
-        for (; *ptr != '\0' && *ptr != '"' &&
-                 (in_quotes || !is_whitespace(*ptr)); ptr++);
+    if (*ptr == '/') ptr++;
+    while (*ptr && !is_whitespace(*ptr) && *ptr != '/') {
         if (*ptr == '"') {
-            in_quotes = !in_quotes;
-            ptr++;
+            while (*ptr && *ptr != '"') ptr++;
+            /* Odd number of double quotes is illegal for XCOPY */
+            if (!*ptr) return RC_INITERROR;
         }
-        /* 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;
+        ptr++;
     }

len = ptr - *cmdline;