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

Timestamp:

Apr 2, 2010 8:36:35 PM (15 years ago)

Author:

vboxsync

Message:

RTGetOptArgvToString: Implemented bourne shell style quoting.

File:

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

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

@@ -390 +390 @@
 {
     AssertReturn(!(fFlags & ~RTGETOPTARGV_CNV_QUOTE_MASK), VERR_INVALID_PARAMETER);
-    AssertReturn((fFlags & RTGETOPTARGV_CNV_QUOTE_MASK) == RTGETOPTARGV_CNV_QUOTE_MS_CRT, VERR_NOT_IMPLEMENTED);
 
 #define PUT_CH(ch) \
@@ -462 +461 @@
             PUT_CH('"');
         }
-        else /* bourne shell */
-        {
-            AssertFailed(/*later*/);
+        else
+        {
+            /*
+             * Bourne Shell quoting.  Quote the whole thing in single quotes
+             * and use double quotes for any single quote chars.
+             */
+            PUT_CH('\'');
+            char ch;
+            while ((ch = *pszArg++))
+            {
+                if (ch == '\'')
+                {
+                    PUT_SZ("'\"'\"'");
+                }
+                else
+                {
+                    PUT_CH(ch);
+                }
+            }
+            PUT_CH('\'');
         }
     }