Changeset 55530 in vbox

Timestamp:

Apr 29, 2015 5:40:40 PM (10 years ago)

Author:

vboxsync

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

99889

Message:

RTProcCreate,RTProcCreateEx: Added RTPROC_FLAGS_UNQUOTED_ARGS for allowing working around for windows programs with their own brilliant ideas about command line parsing.

Location:

trunk

Files:

• include/iprt/process.h (modified) (1 diff)
• src/VBox/Runtime/r3/posix/process-creation-posix.cpp (modified) (1 diff)
• src/VBox/Runtime/r3/win/process-win.cpp (modified) (2 diffs)

trunk/include/iprt/process.h

@@ -206 +206 @@
 /** Search the PATH for the executable.  */
 #define RTPROC_FLAGS_SEARCH_PATH            RT_BIT(6)
-
+/** Don't quote and escape arguments on Windows and similar platforms where a
+ * command line is passed to the child process instead of an argument vector,
+ * just join up argv with a space between each.  Ignored on platforms
+ * passing argument the vector. */
+#define RTPROC_FLAGS_UNQUOTED_ARGS          RT_BIT(7)
+/** Valid flag mask. */
+#define RTPROC_FLAGS_VALID_MASK             UINT32_C(0xff)
 /** @}  */
 

trunk/src/VBox/Runtime/r3/posix/process-creation-posix.cpp

@@ -304 +304 @@
     AssertPtrReturn(pszExec, VERR_INVALID_POINTER);
     AssertReturn(*pszExec, VERR_INVALID_PARAMETER);
-    AssertReturn(!(fFlags & ~(RTPROC_FLAGS_DETACHED | RTPROC_FLAGS_HIDDEN | RTPROC_FLAGS_SERVICE | RTPROC_FLAGS_SAME_CONTRACT | RTPROC_FLAGS_NO_PROFILE | RTPROC_FLAGS_SEARCH_PATH)), VERR_INVALID_PARAMETER);
+    AssertReturn(!(fFlags & ~RTPROC_FLAGS_VALID_MASK), VERR_INVALID_PARAMETER);
     AssertReturn(!(fFlags & RTPROC_FLAGS_DETACHED) || !phProcess, VERR_INVALID_PARAMETER);
     AssertReturn(hEnv != NIL_RTENV, VERR_INVALID_PARAMETER);

trunk/src/VBox/Runtime/r3/win/process-win.cpp

@@ -1084 +1084 @@
     AssertPtrReturn(pszExec, VERR_INVALID_POINTER);
     AssertReturn(*pszExec, VERR_INVALID_PARAMETER);
-    AssertReturn(!(fFlags & ~(RTPROC_FLAGS_DETACHED | RTPROC_FLAGS_HIDDEN | RTPROC_FLAGS_SERVICE | RTPROC_FLAGS_SAME_CONTRACT
-                              | RTPROC_FLAGS_NO_PROFILE | RTPROC_FLAGS_NO_WINDOW | RTPROC_FLAGS_SEARCH_PATH)),
-                 VERR_INVALID_PARAMETER);
+    AssertReturn(!(fFlags & ~RTPROC_FLAGS_VALID_MASK), VERR_INVALID_PARAMETER);
     AssertReturn(!(fFlags & RTPROC_FLAGS_DETACHED) || !phProcess, VERR_INVALID_PARAMETER);
     AssertReturn(hEnv != NIL_RTENV, VERR_INVALID_PARAMETER);
@@ -1218 +1216 @@
     {
         PRTUTF16 pwszCmdLine;
-        rc = RTGetOptArgvToUtf16String(&pwszCmdLine, papszArgs, RTGETOPTARGV_CNV_QUOTE_MS_CRT);
+        rc = RTGetOptArgvToUtf16String(&pwszCmdLine, papszArgs,
+                                       !(fFlags & RTPROC_FLAGS_UNQUOTED_ARGS)
+                                       ? RTGETOPTARGV_CNV_QUOTE_MS_CRT : RTGETOPTARGV_CNV_UNQUOTED);
         if (RT_SUCCESS(rc))
         {