Changeset 36025 in vbox

Timestamp:

Feb 21, 2011 9:20:11 AM (14 years ago)

Author:

vboxsync

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

70126

Message:

VBoxService/GuestCtrl: Fixed argument handling for sysprep.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp

@@ -1297 +1297 @@
 
     int  rc = VINF_SUCCESS;
+    char szExecExp[RTPATH_MAX];
 #ifdef RT_OS_WINDOWS
     /*
@@ -1305 +1306 @@
     if (RTStrICmp(pszExec, "sysprep") == 0)
     {
-        /* Get the predefined path of sysprep.exe (depending on Windows OS). */
+        /* Use a predefined sysprep path as default. */
         char szSysprepCmd[RTPATH_MAX] = "C:\\sysprep\\sysprep.exe";
+
+        /*
+         * On Windows Vista (and up) sysprep is located in "system32\\sysprep\\sysprep.exe",
+         * so detect the OS and use a different path.
+         */
         OSVERSIONINFOEX OSInfoEx;
         RT_ZERO(OSInfoEx);
@@ -1318 +1324 @@
                 rc = RTPathAppend(szSysprepCmd, sizeof(szSysprepCmd), "system32\\sysprep\\sysprep.exe");
         }
-        rc = RTProcCreateEx(szSysprepCmd, papszArgs, hEnv, 0 /* fFlags */,
-                            phStdIn, phStdOut, phStdErr, NULL /* pszAsUser */,
-                            NULL /* pszPassword */, phProcess);
+
+        if (RT_SUCCESS(rc))
+        {
+            char **papszArgsExp;
+            rc = VBoxServiceControlExecPrepareArgv(szSysprepCmd, papszArgs, &papszArgsExp);
+            if (RT_SUCCESS(rc))
+            {
+                rc = RTProcCreateEx(szSysprepCmd, papszArgsExp, hEnv, 0 /* fFlags */,
+                                    phStdIn, phStdOut, phStdErr, NULL /* pszAsUser */,
+                                    NULL /* pszPassword */, phProcess);
+            }
+            RTGetOptArgvFree(papszArgsExp);
+        }
         return rc;
     }
@@ -1328 +1344 @@
      * Do the environment variables expansion on executable and arguments.
      */
-    char szExecExp[RTPATH_MAX];
     rc = VBoxServiceControlExecResolveExecutable(pszExec, szExecExp, sizeof(szExecExp));
     if (RT_SUCCESS(rc))