Changeset 36733 in vbox

Timestamp:

Apr 19, 2011 4:03:27 PM (14 years ago)

Author:

vboxsync

Message:

VBoxService/GuestCtrl: Fix argv[0] handling when executing guest programs.

File:

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

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

@@ -707 +707 @@
 #ifdef VBOXSERVICE_TOOLBOX
 /**
- * Constructs the argv command line of a VBoxService program
- * by first appending the full path of VBoxService along  with the given
- * tool name (e.g. "vbox_cat") + the tool's actual command line parameters.
+ * Constructs the argv command line by resolving environment variables
+ * and relative paths.
  *
  * @return IPRT status code.
- * @param  pszFileName      File name (full path) of this process.
- * @param  papszArgs        Original argv command line from the host.
+ * @param  pszArgv0         First argument (argv0), either original or modified version.
+ * @param  papszArgs        Original argv command line from the host, starting at argv[1].
  * @param  ppapszArgv       Pointer to a pointer with the new argv command line.
  *                          Needs to be freed with RTGetOptArgvFree.
  */
-static int VBoxServiceControlExecPrepareArgv(const char *pszFileName,
+static int VBoxServiceControlExecPrepareArgv(const char *pszArgv0,
                                              const char * const *papszArgs, char ***ppapszArgv)
 {
-    AssertPtrReturn(pszFileName, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(papszArgs, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pszArgv0, VERR_INVALID_PARAMETER);
     AssertPtrReturn(ppapszArgv, VERR_INVALID_PARAMETER);
-
-/** @todo r=bird: Obvious misdesign: argv[0] does NOT have to be the same as
- *        the full path to the executable file name!!   I thought we went thru
- *        all that when you did the VBoxService toolbox stuff, i.e. how busybox
- *        works? */
 
 /** @todo RTGetOptArgvToString converts to MSC quoted string, while
@@ -737 +730 @@
                                   RTGETOPTARGV_CNV_QUOTE_MS_CRT); /* RTGETOPTARGV_CNV_QUOTE_BOURNE_SH */
     if (   RT_SUCCESS(rc)
-        && pszArgs) /**< @todo pszArg will never be NULL on a successfull return. Perhaps *pszArgs was meant? */
+        && *pszArgs)
     {
         /*
@@ -748 +741 @@
         {
             char *pszNewArgs;
-            if (RTStrAPrintf(&pszNewArgs, "%s %s", pszFileName, szArgsExp))
+            if (RTStrAPrintf(&pszNewArgs, "%s %s", pszArgv0, szArgsExp))
             {
 #ifdef DEBUG
@@ -766 +759 @@
         int iNumArgsIgnored;
         rc = RTGetOptArgvFromString(ppapszArgv, &iNumArgsIgnored,
-                                    pszFileName, NULL /* Use standard separators. */);
+                                    pszArgv0, NULL /* Use standard separators. */);
     }
     return rc;
@@ -829 +822 @@
         {
             char **papszArgsExp;
-            rc = VBoxServiceControlExecPrepareArgv(szSysprepCmd, papszArgs, &papszArgsExp);
+            rc = VBoxServiceControlExecPrepareArgv(szSysprepCmd /* argv0 */, &papszArgs[1], &papszArgsExp);
             if (RT_SUCCESS(rc))
             {
@@ -849 +842 @@
     {
         char **papszArgsExp;
-        rc = VBoxServiceControlExecPrepareArgv(szExecExp, papszArgs, &papszArgsExp);
+        rc = VBoxServiceControlExecPrepareArgv(szExecExp /* argv0 */, &papszArgs[1], &papszArgsExp);
         if (RT_SUCCESS(rc))
         {
@@ -870 +863 @@
 #ifdef DEBUG
             char *pszCmdLine;
-            rc = RTGetOptArgvToString(&pszCmdLine, papszArgsExp, 0 /* Default */);
+            rc = RTGetOptArgvToString(&pszCmdLine, papszArgsExp, 0 /* Default */);
             AssertRC(rc);
             VBoxServiceVerbose(3, "ControlExec: Executing: %s %s\n",