Changeset 33422 in vbox

Timestamp:

Oct 25, 2010 1:33:07 PM (14 years ago)

Author:

vboxsync

Message:

GuestCopy/VBoxService: Bugfixes.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceControlExec.cpp (modified) (3 diffs)
• VBoxServiceToolBox.cpp (modified) (1 diff)

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

@@ -1035 +1035 @@
  * @return IPRT status code.
  * @param  pszFileName      File name (full path) of this process.
- * @param  pszTool          Tool name (e.g. "vbox_cat") to use.
  * @param  papszArgs        Original argv command line from the host.
  * @param  ppapszArgv       Pointer to a pointer with the new argv command line.
  *                          Needs to be freed with RTGetOptArgvFree.
  */
-int VBoxServiceControlExecPrepareToolboxArgv(const char *pszFileName, const char *pszTool,
+int VBoxServiceControlExecPrepareToolboxArgv(const char *pszFileName,
                                              const char * const *papszArgs, char ***ppapszArgv)
 {
     AssertPtrReturn(pszFileName, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pszTool, VERR_INVALID_PARAMETER);
     AssertPtrReturn(papszArgs, VERR_INVALID_PARAMETER);
     AssertPtrReturn(ppapszArgv, VERR_INVALID_PARAMETER);
@@ -1058 +1056 @@
          * tool name to new process' command line.
          */
-        if (RTStrAPrintf(&pszNewArgs, "%s %s %s", pszFileName, pszTool, pszArgs))
+        if (RTStrAPrintf(&pszNewArgs, "%s %s", pszFileName, pszArgs))
         {
             int iNumArgsIgnored;
@@ -1136 +1134 @@
             /* We want to use the internal toolbox. */
             pszCmdTool = RTStrDup(szVBoxService);
-            rc = VBoxServiceControlExecPrepareToolboxArgv(pszCmdTool, pszExec,
-                                                          papszArgs, &papszArgsTool);
+            rc = VBoxServiceControlExecPrepareToolboxArgv(pszCmdTool, papszArgs, &papszArgsTool);
         }
 

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

@@ -205 +205 @@
             || !strcmp(argv[0], "vbox_cat"))
         {
-            rc = VBoxServiceToolboxCat(argc - 1, &argv[1]);
+            rc = VBoxServiceToolboxCat(argc, argv);
         }
     }