Changeset 83405 in vbox

Timestamp:

Mar 25, 2020 12:45:01 PM (5 years ago)

Author:

vboxsync

Message:

Guest Control/Main + VBoxService: Resolved another @todo: Added ability for guest processes to use argv[0] independently of the actual execution command. bugref:9320

Location:

trunk

Files:

• include/VBox/HostServices/GuestControlSvc.h (modified) (4 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp (modified) (1 diff)
• src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp (modified) (3 diffs)
• src/VBox/HostServices/GuestControl/VBoxGuestControlSvc.cpp (modified) (1 diff)
• src/VBox/Main/src-client/GuestProcessImpl.cpp (modified) (2 diffs)

trunk/include/VBox/HostServices/GuestControlSvc.h

@@ -139 +139 @@
      * The host wants to execute something in the guest. This can be a command
      * line or starting a program.
-     * @note Legacy (VBox < 4.3) message.
      */
     HOST_MSG_EXEC_CMD = 100,
     /**
      * Sends input data for stdin to a running process executed by HOST_EXEC_CMD.
-     * @note Legacy (VBox < 4.3) message.
      */
     HOST_MSG_EXEC_SET_INPUT = 101,
@@ -150 +148 @@
      * Gets the current status of a running process, e.g.
      * new data on stdout/stderr, process terminated etc.
-     * @note Legacy (VBox < 4.3) message.
      */
     HOST_MSG_EXEC_GET_OUTPUT = 102,
@@ -692 +689 @@
  * @{ */
 /** Supports HOST_MSG_FILE_SET_SIZE. */
-#define VBOX_GUESTCTRL_GF_0_SET_SIZE     RT_BIT_64(0)
+#define VBOX_GUESTCTRL_GF_0_SET_SIZE                RT_BIT_64(0)
+/** Supports (fixes) treating argv[0] separately from the actual execution command.
+ *  Without this flag the actual execution command is taken as argv[0]. */
+#define VBOX_GUESTCTRL_GF_0_PROCESS_ARGV0           RT_BIT_64(1)
 /** Bit that must be set in the 2nd parameter, will be cleared if the host reponds
  * correctly (old hosts might not). */
-#define VBOX_GUESTCTRL_GF_1_MUST_BE_ONE RT_BIT_64(63)
+#define VBOX_GUESTCTRL_GF_1_MUST_BE_ONE             RT_BIT_64(63)
 /** @} */
 
@@ -704 +704 @@
  *  GUEST_FILE_NOTIFYTYPE_WRITE_OFFSET notification types. */
 #define VBOX_GUESTCTRL_HF_0_NOTIFY_RDWR_OFFSET      RT_BIT_64(0)
+/** Host supports sending (treating) argv[0] separately from the actual execution command.
+ *  Needed when newer Guest Additions which support VBOX_GUESTCTRL_GF_0_PROCESS_ARGV0 run on an older
+ *  host which doesn't in turn support VBOX_GUESTCTRL_HF_0_PROCESS_ARGV0. */
+#define VBOX_GUESTCTRL_HF_0_PROCESS_ARGV0           RT_BIT_64(1)
 /** @} */
 

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

@@ -216 +216 @@
              * Report features to the host.
              */
-            rc = VbglR3GuestCtrlReportFeatures(g_idControlSvcClient, VBOX_GUESTCTRL_GF_0_SET_SIZE, &g_fControlHostFeatures0);
+            const uint64_t fGuestFeatures = VBOX_GUESTCTRL_GF_0_SET_SIZE
+                                          | VBOX_GUESTCTRL_GF_0_PROCESS_ARGV0;
+
+            rc = VbglR3GuestCtrlReportFeatures(g_idControlSvcClient, fGuestFeatures, &g_fControlHostFeatures0);
             if (RT_SUCCESS(rc))
                 VGSvcVerbose(3, "Host features: %#RX64\n", g_fControlHostFeatures0);

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

@@ -1071 +1071 @@
 #endif
 
-    /* HACK ALERT! Since we still don't allow the user to really specify the first
-                   argument separately from the executable image, we have to fudge
+    /* HACK ALERT! Older hosts (< VBox 6.1.x) did not allow the user to really specify the first
+                   argument separately from the executable image, so we have to fudge
                    a little in the unquoted argument case to deal with executables
                    containing spaces. */
-    /** @todo Fix the stupid host/guest protocol so the user can do this for us! */
     if (   !(fFlags & EXECUTEPROCESSFLAG_UNQUOTED_ARGS)
         || !strpbrk(pszArgv0, " \t\n\r")
@@ -1094 +1093 @@
         }
     }
+
     if (RT_SUCCESS(rc))
     {
@@ -1342 +1342 @@
     if (RT_SUCCESS(rc))
     {
+        const char *pszArgv0 = RT_BOOL(g_fControlHostFeatures0 & VBOX_GUESTCTRL_HF_0_PROCESS_ARGV0)
+                             ? papszArgs[0] : pszExec;
         char **papszArgsExp;
-        /** @todo r-bird: pszExec != argv[0]! When are you going to get that?!? How many
-         * times does this need to be pointed out?  HOST/GUEST INTERFACE IS MISDESIGNED! */
-        rc = vgsvcGstCtrlProcessAllocateArgv(pszExec /* Always use the unmodified executable name as argv0. */,
-                                             papszArgs /* Append the rest of the argument vector (if any). */,
+        rc = vgsvcGstCtrlProcessAllocateArgv(pszArgv0, papszArgs,
                                              fFlags, &papszArgsExp);
         if (RT_FAILURE(rc))

trunk/src/VBox/HostServices/GuestControl/VBoxGuestControlSvc.cpp

@@ -934 +934 @@
 
 /** Host feature mask for GUEST_MSG_REPORT_FEATURES/GUEST_MSG_QUERY_FEATURES. */
-static uint64_t const g_fGstCtrlHostFeatures0 = VBOX_GUESTCTRL_HF_0_NOTIFY_RDWR_OFFSET;
-
+static uint64_t const g_fGstCtrlHostFeatures0 = VBOX_GUESTCTRL_HF_0_NOTIFY_RDWR_OFFSET
+                                              | VBOX_GUESTCTRL_HF_0_PROCESS_ARGV0;
 
 

trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp

@@ -35 +35 @@
 # error "VBOX_WITH_GUEST_CONTROL must defined in this file"
 #endif
+#include "GuestImpl.h"
 #include "GuestProcessImpl.h"
 #include "GuestSessionImpl.h"
@@ -1077 +1078 @@
         papszArgv[cArgs] = NULL;
 
-        if (uProtocol < UINT32_C(0xdeadbeef) ) /** @todo implement a way of sending argv[0], best idea is a new command. */
+        Guest *pGuest = mSession->i_getParent();
+        AssertPtr(pGuest);
+
+        /* If the Guest Additions don't support using argv[0] correctly (< 6.1.x), don't supply it. */
+        if (!RT_BOOL(pGuest->i_getGuestControlFeatures0() & VBOX_GUESTCTRL_GF_0_PROCESS_ARGV0))
             vrc = RTGetOptArgvToString(&pszArgs, papszArgv + 1, RTGETOPTARGV_CNV_QUOTE_BOURNE_SH);
-        else
+        else /* ... else send the whole argv, including argv[0]. */
             vrc = RTGetOptArgvToString(&pszArgs, papszArgv, RTGETOPTARGV_CNV_QUOTE_BOURNE_SH);