Changeset 83409 in vbox for trunk

Timestamp:

Mar 25, 2020 1:15:39 PM (5 years ago)

Author:

vboxsync

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

136626

Message:

Guest Control/VBoxService: Resolved another @todo: Don't ignore non-options in the guest session argument handler. bugref:9320

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxService.cpp (modified) (1 diff)
• VBoxServiceControl.h (modified) (1 diff)
• VBoxServiceControlSession.cpp (modified) (1 diff)

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

@@ -915 +915 @@
      */
     if (   argc >= 2
-        && !RTStrICmp(argv[1], "guestsession"))
+        && !RTStrICmp(argv[1], VBOXSERVICECTRLSESSION_GETOPT_PREFIX))
         fUserSession = true;
 #endif

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

@@ -145 +145 @@
 typedef VBOXSERVICECTRLSESSIONTHREAD *PVBOXSERVICECTRLSESSIONTHREAD;
 
+/** Defines the prefix being used for telling our service executable that we're going
+ *  to spawn a new (Guest Control) user session. */
+#define VBOXSERVICECTRLSESSION_GETOPT_PREFIX             "guestsession"
+
 /** Flag indicating that this session has been spawned from
  *  the main executable. */

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

@@ -2682 +2682 @@
 
             case VINF_GETOPT_NOT_OPTION:
-                /* Ignore; might be "guestsession" main command. */
-                /** @todo r=bird: We DO NOT ignore stuff on the command line! */
-                break;
-
+            {
+                if (!RTStrICmp(ValueUnion.psz, VBOXSERVICECTRLSESSION_GETOPT_PREFIX))
+                    break;
+                /* else fall through and bail out. */
+                RT_FALL_THROUGH();
+            }
             default:
-                return RTMsgErrorExit(RTEXITCODE_SYNTAX, "Unknown command '%s'", ValueUnion.psz);
+                return RTMsgErrorExit(RTEXITCODE_SYNTAX, "Unknown argument '%s'", ValueUnion.psz);
         }
     }