Changeset 28660 in vbox

Timestamp:

Apr 23, 2010 3:35:17 PM (15 years ago)

Author:

vboxsync

Message:

Guest Control: Reverted r60506, r60507, r60509, added argv[0] in VBoxManage instead.

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxService/VBoxServiceControlExec.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (1 diff)

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

@@ -616 +616 @@
     pData->uNumArgs = 0; /* Initialize in case of RTGetOptArgvFromString() is failing ... */
 
-    /* Prepare argument list. Always add actual command line as first argument (argv[0]). */
-    char *pszArgsTemp = NULL;
-    int rc = RTStrAPrintf(&pszArgsTemp, "%s %s", pszCmd, (uNumArgs > 0) ? pszArgs : "");
-    if (RT_SUCCESS(rc) && pszArgsTemp)
-    {
-        rc = RTGetOptArgvFromString(&pData->papszArgs, (int*)&pData->uNumArgs,
-                                    pszArgsTemp, NULL);
-        RTStrFree(pszArgsTemp);
-    }
-
-    /* Did we get at least as much arguments as told? */
-    Assert(pData->uNumArgs >= uNumArgs);
+    /* Prepare argument list. */
+    int rc = RTGetOptArgvFromString(&pData->papszArgs, (int*)&pData->uNumArgs,
+                                    (uNumArgs > 0) ? pszArgs : "", NULL);
+    /* Did we get the same result? */
+    Assert(uNumArgs == pData->uNumArgs);
 
     if (RT_SUCCESS(rc))

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

@@ -93 +93 @@
     bool verbose = false;
     bool have_timeout = false;
+
+    /* Always use the actual command line as argv[0]. */
+    args.push_back(Bstr(Utf8Cmd));
 
     /* Iterate through all possible commands (if available). */