Changeset 67598 in vbox

Timestamp:

Jun 26, 2017 9:17:22 AM (8 years ago)

Author:

vboxsync

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

116356

Message:

RTGetOptArgvFromString: Added a RTGETOPTARGV_CNV_MODIFY_INPUT flag for avoiding duplicating the input command line string.

Location:

trunk

Files:

• include/iprt/getopt.h (modified) (3 diffs)
• include/iprt/mangling.h (modified) (1 diff)
• src/VBox/Runtime/common/misc/getoptargv.cpp (modified) (5 diffs)

trunk/include/iprt/getopt.h

@@ -412 +412 @@
  *
  * @param   ppapszArgv      Where to return the argument vector.  This must be
- *                          freed by calling RTGetOptArgvFree.
+ *                          freed by calling RTGetOptArgvFreeEx or
+ *                          RTGetOptArgvFree.
  * @param   pcArgs          Where to return the argument count.
  * @param   pszCmdLine      The string to parse.
@@ -432 +433 @@
 
 /**
+ * Frees and argument vector returned by RTGetOptStringToArgv, taking
+ * RTGETOPTARGV_CNV_MODIFY_INPUT into account.
+ *
+ * @param   papszArgv       Argument vector.  NULL is fine.
+ * @param   fFlags          The flags passed to RTGetOptStringToArgv.
+ */
+RTDECL(void) RTGetOptArgvFreeEx(char **papszArgv, uint32_t fFlags);
+
+/**
  * Turns an argv array into a command line string.
  *
@@ -448 +458 @@
 RTDECL(int) RTGetOptArgvToString(char **ppszCmdLine, const char * const *papszArgv, uint32_t fFlags);
 
-/** @name RTGetOptArgvToString and RTGetOptArgvToUtf16String flags
+/** @name RTGetOptArgvToString, RTGetOptArgvToUtf16String and
+ *        RTGetOptArgvFromString flags
  * @{ */
 /** Quote strings according to the Microsoft CRT rules. */
-#define RTGETOPTARGV_CNV_QUOTE_MS_CRT       UINT32_C(0)
+#define RTGETOPTARGV_CNV_QUOTE_MS_CRT       UINT32_C(0x00000000)
 /** Quote strings according to the Unix Bourne Shell. */
-#define RTGETOPTARGV_CNV_QUOTE_BOURNE_SH    UINT32_C(1)
+#define RTGETOPTARGV_CNV_QUOTE_BOURNE_SH    UINT32_C(0x00000001)
 /** Don't quote any strings at all. */
-#define RTGETOPTARGV_CNV_UNQUOTED           UINT32_C(2)
+#define RTGETOPTARGV_CNV_UNQUOTED           UINT32_C(0x00000002)
 /** Mask for the quoting style. */
-#define RTGETOPTARGV_CNV_QUOTE_MASK         UINT32_C(3)
+#define RTGETOPTARGV_CNV_QUOTE_MASK         UINT32_C(0x00000003)
+/** Allow RTGetOptArgvFromString to modifying the command line input string.
+ * @note Must use RTGetOptArgvFreeEx to free. */
+#define RTGETOPTARGV_CNV_MODIFY_INPUT       UINT32_C(0x00000004)
+/** Valid bits. */
+#define RTGETOPTARGV_CNV_VALID_MASK         UINT32_C(0x00000007)
 /** @} */
 

trunk/include/iprt/mangling.h

@@ -956 +956 @@
 # define RTGetOpt                                       RT_MANGLER(RTGetOpt)
 # define RTGetOptArgvFree                               RT_MANGLER(RTGetOptArgvFree)
+# define RTGetOptArgvFreeEx                             RT_MANGLER(RTGetOptArgvFreeEx)
 # define RTGetOptArgvFromString                         RT_MANGLER(RTGetOptArgvFromString)
 # define RTGetOptArgvToString                           RT_MANGLER(RTGetOptArgvToString)

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

@@ -231 +231 @@
     AssertPtr(pcArgs);
     AssertPtr(ppapszArgv);
-    AssertReturn(   fFlags == RTGETOPTARGV_CNV_QUOTE_BOURNE_SH
-                 || fFlags == RTGETOPTARGV_CNV_QUOTE_MS_CRT, VERR_INVALID_FLAGS);
+    AssertReturn(   (fFlags & RTGETOPTARGV_CNV_QUOTE_MASK) == RTGETOPTARGV_CNV_QUOTE_BOURNE_SH
+                 || (fFlags & RTGETOPTARGV_CNV_QUOTE_MASK) == RTGETOPTARGV_CNV_QUOTE_MS_CRT, VERR_INVALID_FLAGS);
+    AssertReturn(~(fFlags & ~RTGETOPTARGV_CNV_VALID_MASK), VERR_INVALID_FLAGS);
+
     if (!pszSeparators)
         pszSeparators = " \t\n\r";
@@ -243 +245 @@
      * Parse the command line and chop off it into argv individual argv strings.
      */
+    const char *pszSrc    = pszCmdLine;
+    char       *pszDup    = NULL;
+    char       *pszDst;
+    if (fFlags & RTGETOPTARGV_CNV_MODIFY_INPUT)
+        pszDst = (char *)pszCmdLine;
+    else
+    {
+        pszDst = pszDup = (char *)RTMemAlloc(strlen(pszSrc) + 1);
+        if (!pszDup)
+            return VERR_NO_STR_MEMORY;
+    }
     int         rc        = VINF_SUCCESS;
-    const char *pszSrc    = pszCmdLine;
-    char       *pszDup    = (char *)RTMemAlloc(strlen(pszSrc) + 1);
-    char       *pszDst    = pszDup;
-    if (!pszDup)
-        return VERR_NO_STR_MEMORY;
     char      **papszArgs = NULL;
     unsigned    iArg      = 0;
@@ -425 +433 @@
 RTDECL(void) RTGetOptArgvFree(char **papszArgv)
 {
+    RTGetOptArgvFreeEx(papszArgv, 0);
+}
+
+
+RTDECL(void) RTGetOptArgvFreeEx(char **papszArgv, uint32_t fFlags)
+{
+    Assert(~(fFlags & ~RTGETOPTARGV_CNV_VALID_MASK));
     if (papszArgv)
     {
@@ -431 +446 @@
          * RTGetOptArgvFromString for the particulars.
          */
-        RTMemFree(papszArgv[0]);
+        if (!(fFlags & RTGETOPTARGV_CNV_MODIFY_INPUT))
+            RTMemFree(papszArgv[0]);
         RTMemFree(papszArgv);
     }
@@ -502 +518 @@
 RTDECL(int) RTGetOptArgvToString(char **ppszCmdLine, const char * const *papszArgv, uint32_t fFlags)
 {
-    AssertReturn(fFlags <= RTGETOPTARGV_CNV_UNQUOTED, VERR_INVALID_PARAMETER);
+    AssertReturn((fFlags & RTGETOPTARGV_CNV_QUOTE_MASK) <= RTGETOPTARGV_CNV_UNQUOTED, VERR_INVALID_FLAGS);
+    AssertReturn(!(fFlags & (~RTGETOPTARGV_CNV_VALID_MASK | RTGETOPTARGV_CNV_MODIFY_INPUT)), VERR_INVALID_FLAGS);
 
 #define PUT_CH(ch) \