Changeset 56002 in vbox for trunk/src

Timestamp:

May 21, 2015 12:19:28 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

100513

Message:

RTGetOptArgvFromString/MS_CRT: Implemented undocumented doubledouble quotes, current CRT style.

Location:

trunk/src/VBox/Runtime

Files:

• common/misc/getoptargv.cpp (modified) (3 diffs)
• testcase/tstRTGetOptArgv.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/common/misc/getoptargv.cpp

@@ -334 +334 @@
                     break;
                 if (Cp == '"')
-                    fInQuote = !fInQuote;
+                {
+                    /* Two double quotes insides a quoted string in an escape
+                       sequence and we output one double quote char.
+                       See http://www.daviddeley.com/autohotkey/parameters/parameters.htm */
+                    if (!fInQuote)
+                        fInQuote = true;
+                    else if (*pszSrc != '"')
+                        fInQuote = false;
+                    else
+                    {
+                        pszDst = RTStrPutCp(pszDst, '"');
+                        pszSrc++;
+                    }
+                }
                 else if (!fInQuote && rtGetOptIsCpInSet(Cp, pszSeparators, cchSeparators))
                     break;
@@ -343 +356 @@
                     /* A backslash sequence is only relevant if followed by
                        a double quote, then it will work like an escape char. */
-                    size_t cQuotes = 1;
+                    size_t cSlashes = 1;
                     while (*pszSrc == '\\')
                     {
-                        cQuotes++;
+                        cSlashes++;
                         pszSrc++;
                     }
                     if (*pszSrc != '"')
                         /* Not an escape sequence.  */
-                        while (cQuotes-- > 0)
+                        while (cSlashes-- > 0)
                             pszDst = RTStrPutCp(pszDst, '\\');
                     else
@@ -357 +370 @@
                         /* Escape sequence.  Output half of the slashes.  If odd
                            number, output the escaped double quote . */
-                        while (cQuotes >= 2)
+                        while (cSlashes >= 2)
                         {
                             pszDst = RTStrPutCp(pszDst, '\\');
-                            cQuotes -= 2;
+                            cSlashes -= 2;
                         }
-                        if (!cQuotes)
-                            fInQuote = !fInQuote;
-                        else
+                        if (cSlashes)
+                        {
                             pszDst = RTStrPutCp(pszDst, '"');
-                        pszSrc++;
+                            pszSrc++;
+                        }
                     }
                 }

trunk/src/VBox/Runtime/testcase/tstRTGetOptArgv.cpp

@@ -61 +61 @@
     {
         "0 1 \"\"2'' '3' 4 5 '''''6' 7 8 9 10 11",
-        "0 1 \"\"2 3 4 5 \"6\" 7 8 \"\"\"\"\"\"9\"\"\"\" 10 11",
+        "0 1 \"\"2 3 4 5 \"6\" 7 8 \"\"9\"\" 10 11",
         NULL,
         12,
@@ -83 +83 @@
     },
     {
-        "\t\" asdf \"  '\"'xyz  \"\t\"  '\n'  '\"'  \"'\"\n\r ",
-        "\t\" asdf \"  \\\"xyz  \"\t\"  \"\n\"  \"\\\"\"  '\n\r ",
+        "\t\" asdf \"  '\"'xyz  \"\t\"  '\n'    '\"'    \"'\"\n\r  \\\"xyz",
+        /* Note! Two things here to make CommandLineArgW happy. First, it doesn't use IFS including newline/return, so
+                 we skip that bit of the test.  Second, it uses pre-2008 doubledouble quoting rules, unlike the CRT and IPRT
+                 which uses the post-2008 rules. We work around that by putting that test last.
+                 See http://www.daviddeley.com/autohotkey/parameters/parameters.htm */
+        "\t\" asdf \"  \\\"xyz  \"\t\"  \"\n\"  \"\\\"\"  '  \"\"\"xyz\"",
         NULL,
-        6,
+        7,
         {
             " asdf ",
@@ -94 +98 @@
             "\"",
             "\'",
-            NULL, NULL,
+            "\"xyz",
+            NULL,
             NULL, NULL, NULL, NULL,  NULL, NULL, NULL, NULL,
         },
-        "' asdf ' '\"xyz' '\t' '\n' '\"' ''\"'\"''",
-        "\" asdf \" \"\\\"xyz\" \"\t\" \"\n\" \"\\\"\" '"
+        "' asdf ' '\"xyz' '\t' '\n' '\"' ''\"'\"'' '\"xyz'",
+        "\" asdf \" \"\\\"xyz\" \"\t\" \"\n\" \"\\\"\" ' \"\\\"xyz\""
     },
     {
@@ -286 +291 @@
                                   g_aTests[i].pszInMsCrt, g_aTests[i].pszSeparators);
             RTTESTI_CHECK_RETV(papszArgs1[cArgs1] == NULL);
-            tstCheckNativeMsCrtToArgv(g_aTests[i].pszInMsCrt, g_aTests[i].cArgs, g_aTests[i].apszArgs);
+            if (g_aTests[i].pszSeparators == NULL)
+                tstCheckNativeMsCrtToArgv(g_aTests[i].pszInMsCrt, g_aTests[i].cArgs, g_aTests[i].apszArgs);
 
             /* Second */
@@ -311 +317 @@
                                           i, iArg, papszArgs3[iArg], g_aTests[i].apszArgs[iArg], pszArgs2);
                     RTTESTI_CHECK_RETV(papszArgs3[cArgs3] == NULL);
-                    tstCheckNativeMsCrtToArgv(pszArgs2, g_aTests[i].cArgs, g_aTests[i].apszArgs);
+                    if (g_aTests[i].pszSeparators == NULL)
+                        tstCheckNativeMsCrtToArgv(pszArgs2, g_aTests[i].cArgs, g_aTests[i].apszArgs);
 
                     /*