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

Timestamp:

Apr 28, 2015 7:18:15 PM (10 years ago)

Author:

vboxsync

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

99844

Message:

Tought RTGetOptArgvFromString about escapes and fixed some RTGetOptArgvToString quoting table bugs.

File:

• trunk/src/VBox/Runtime/common/misc/getoptargv.cpp (modified) (8 diffs)

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

@@ -47 +47 @@
  * require quoting of.
  */
-static uint8_t const g_abmQuoteChars[RTGETOPTARGV_CNV_QUOTE_MASK + 1][128/8] =
-{
-    { 0xfe, 0xff, 0x0f, 0x00, 0x65, 0x00, 0x00, 0x50 },
-    { 0xfe, 0xff, 0x0f, 0x00, 0xd7, 0x07, 0x00, 0xd8 },
+static uint8_t
+#ifndef IPRT_REGENERATE_QUOTE_CHARS
+const
+#endif
+g_abmQuoteChars[RTGETOPTARGV_CNV_QUOTE_MASK + 1][16] =
+{
+    { 0xfe, 0xff, 0xff, 0xff, 0x65, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10 },
+    { 0xfe, 0xff, 0xff, 0xff, 0xd7, 0x07, 0x00, 0xd8, 0x00, 0x00, 0x00, 0x18, 0x01, 0x00, 0x00, 0x50 },
 };
 
 
-#if 0   /* To re-generate the bitmaps. */
-#include <stdio.h>
+#ifdef IPRT_REGENERATE_QUOTE_CHARS   /* To re-generate the bitmaps. */
+# include <stdio.h>
 int main()
 {
@@ -66 +70 @@
         } while (0)
 # define SET(ConstSuffix, ch) \
-        ASMBitSet(&g_abmQuoteChars[RTGETOPTARGV_CNV_QUOTE_##ConstSuffix], (ch));
+        do { \
+            ASMBitSet(&g_abmQuoteChars[RTGETOPTARGV_CNV_QUOTE_##ConstSuffix], (ch)); \
+            printf(#ConstSuffix ": %#x %d %c\n", (ch), (ch), (ch)); \
+        } while (0)
 
     /* just flag all the control chars as in need of quoting. */
@@ -76 +83 @@
 
     /* MS CRT / CMD.EXE: */
-    SET(MS_CRT, '"')
-    SET(MS_CRT, '&')
-    SET(MS_CRT, '>')
-    SET(MS_CRT, '<')
-    SET(MS_CRT, '|')
-    SET(MS_CRT, '%')
+    SET(MS_CRT, '"');
+    SET(MS_CRT, '&');
+    SET(MS_CRT, '>');
+    SET(MS_CRT, '<');
+    SET(MS_CRT, '|');
+    SET(MS_CRT, '%');
 
     /* Bourne shell: */
@@ -105 +112 @@
     {
         printf("    {");
-        for (size_t iByte = 0; iByte < 8; iByte++)
+        for (size_t iByte = 0; iByte < 16; iByte++)
             printf(iByte == 0 ? " 0x%02x" : ", 0x%02x", g_abmQuoteChars[iType][iByte]);
         printf(" },\n");
@@ -111 +118 @@
     return 0;
 }
-#endif /* To re-generate the bitmaps. */
-
+
+#else /* !IPRT_REGENERATE_QUOTE_CHARS */
 
 /**
@@ -262 +269 @@
         papszArgs[iArg++] = pszDst;
 
-        /* Parse and copy the string over. */
+        /*
+         * Parse and copy the string over.
+         */
         RTUNICP CpQuote = 0;
         RTUNICP Cp;
@@ -276 +285 @@
                 else if (rtGetOptIsCpInSet(Cp, pszSeparators, cchSeparators))
                     break;
+                else if (Cp != '\\')
+                    pszDst = RTStrPutCp(pszDst, Cp);
                 else
+                {
+                    /* escaped char */
+                    rc = RTStrGetCpEx(&pszSrc, &Cp);
+                    if (RT_FAILURE(rc) || !Cp)
+                        break;
                     pszDst = RTStrPutCp(pszDst, Cp);
+                }
             }
             else if (CpQuote != Cp)
-                pszDst = RTStrPutCp(pszDst, Cp);
+            {
+                if (Cp != '\\' || CpQuote == '\'')
+                    pszDst = RTStrPutCp(pszDst, Cp);
+                else
+                {
+                    /* escaped char */
+                    rc = RTStrGetCpEx(&pszSrc, &Cp);
+                    if (RT_FAILURE(rc) || !Cp)
+                        break;
+                    pszDst = RTStrPutCp(pszDst, Cp);
+                }
+            }
             else
                 CpQuote = 0;
@@ -511 +539 @@
 }
 
+#endif  /* !IPRT_REGENERATE_QUOTE_CHARS */
+