Changeset 83405 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

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

Author:

vboxsync

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

136622

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

File:

• trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp (modified) (2 diffs)

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);