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

Timestamp:

Mar 25, 2020 4:49:34 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 (follow-up to r136622). bugref:9320

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestProcessImpl.cpp (modified) (2 diffs)
• GuestSessionImpl.cpp (modified) (1 diff)

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

@@ -48 +48 @@
 
 #include <memory> /* For auto_ptr. */
+#include <algorithm> /* For std::rotate. */
 
 #include <iprt/asm.h>
@@ -1081 +1082 @@
         AssertPtr(pGuest);
 
+        const uint64_t fGuestControlFeatures0 = pGuest->i_getGuestControlFeatures0();
+
         /* 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))
+        if (!(fGuestControlFeatures0 & VBOX_GUESTCTRL_GF_0_PROCESS_ARGV0))
             vrc = RTGetOptArgvToString(&pszArgs, papszArgv + 1, RTGETOPTARGV_CNV_QUOTE_BOURNE_SH);
         else /* ... else send the whole argv, including argv[0]. */

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

@@ -4127 +4127 @@
     procInfo.mExecutable = pszExecutable;
     if (aArguments.size())
+    {
         for (size_t i = 0; i < aArguments.size(); i++)
             procInfo.mArguments.push_back(aArguments[i]);
+    }
+    else /* If no arguments were given, add the executable as argv[0] by default. */
+        procInfo.mArguments.push_back(procInfo.mExecutable);
 
     /* Combine the environment changes associated with the ones passed in by