Changeset 56002 in vbox for trunk/src/VBox/Runtime/common/misc

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.

File:

• trunk/src/VBox/Runtime/common/misc/getoptargv.cpp (modified) (3 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++;
+                        }
                     }
                 }