Changeset 55529 in vbox

Timestamp:

Apr 29, 2015 5:38:33 PM (9 years ago)

Author:

vboxsync

Message:

RTGetOptArgv: Added RTGETOPTARGV_CNV_UNQUOTED.

Location:

trunk

Files:

trunk/include/iprt/getopt.h

-              r48934
+              r55529
 /** Quote strings according to the Unix Bourne Shell. */
 #define RTGETOPTARGV_CNV_QUOTE_BOURNE_SH    UINT32_C(1)
+/** Don't quote any strings at all. */
+#define RTGETOPTARGV_CNV_UNQUOTED           UINT32_C(2)
 /** Mask for the quoting style. */
 #define RTGETOPTARGV_CNV_QUOTE_MASK         UINT32_C(1)
+#define RTGETOPTARGV_CNV_QUOTE_MASK         UINT32_C(3)
 /** @} */

-              r55494
+              r55529
 DECLINLINE(bool) rtGetOpArgvRequiresQuoting(const char *pszArg, uint32_t fFlags, size_t *pcch)
+{
+    char const *psz = pszArg;
+    unsigned char ch;
+    while ((ch = (unsigned char)*psz))
+    {
+        if (   ch < 128
+            && ASMBitTest(&g_abmQuoteChars[fFlags & RTGETOPTARGV_CNV_QUOTE_MASK], ch))
+            return true;
+        psz++;
+    }
+    *pcch = psz - pszArg;
+    if ((fFlags & RTGETOPTARGV_CNV_QUOTE_MASK) != RTGETOPTARGV_CNV_UNQUOTED)
+    {
+        char const *psz = pszArg;
+        unsigned char ch;
+        while ((ch = (unsigned char)*psz))
+        {
+            if (   ch < 128
+                && ASMBitTest(&g_abmQuoteChars[fFlags & RTGETOPTARGV_CNV_QUOTE_MASK], ch))
+                return true;
+            psz++;
+        }
+        *pcch = psz - pszArg;
+    }
+    else
+        *pcch = strlen(pszArg);
     return false;
+}
 …
 RTDECL(int) RTGetOptArgvToString(char **ppszCmdLine, const char * const *papszArgv, uint32_t fFlags)
+{
     AssertReturn(!(fFlags & ~RTGETOPTARGV_CNV_QUOTE_MASK), VERR_INVALID_PARAMETER);
+    AssertReturn(fFlags <= RTGETOPTARGV_CNV_UNQUOTED, VERR_INVALID_PARAMETER);
 #define PUT_CH(ch) \

Note: See TracChangeset for help on using the changeset viewer.