Changeset 24252 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Nov 2, 2009 1:30:13 PM (15 years ago)

Author:

vboxsync

Message:

Frontend/VirtualBox: drop non-working synonyms for --startvm, and document the consistency requirement across three files

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxGlobal.cpp (modified) (1 diff)
• hardenedmain.cpp (modified) (1 diff)
• main.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -4668 +4668 @@
     {
         const char *arg = qApp->argv() [i];
-        if (    !::strcmp (arg, "--startvm")
-            ||  !::strcmp (arg, "-startvm")
-            ||  !::strcmp (arg, "-s")
-            ||  !::strcmp (arg, "--vm")
-            ||  !::strcmp (arg, "-vm"))
+        /* NOTE: the check here must match the corresponding check for the
+         * options to start a VM in main.cpp and hardenedmain.cpp exactly,
+         * otherwise there will be weird error messages. */
+        if (   !::strcmp (arg, "--startvm")
+            || !::strcmp (arg, "-startvm"))
         {
             if (++i < argc)

trunk/src/VBox/Frontends/VirtualBox/src/hardenedmain.cpp

@@ -31 +31 @@
     uint32_t fFlags = SUPSECMAIN_FLAGS_DONT_OPEN_DEV;
     for (int i = 1; i < argc; i++)
-        if (    !strcmp(argv[i], "--startvm")
-            ||  !strcmp(argv[i], "-startvm"))
+        /* NOTE: the check here must match the corresponding check for the
+         * options to start a VM in main.cpp and VBoxGlobal.cpp exactly,
+         * otherwise there will be weird error messages. */
+        if (   !::strcmp(argv[i], "--startvm")
+            || !::strcmp(argv[i], "-startvm"))
         {
             fFlags &= ~SUPSECMAIN_FLAGS_DONT_OPEN_DEV;

trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

@@ -568 +568 @@
     for (int i = 1; i < argc; i++)
     {
-        if (    !::strcmp(argv[i], "--startvm")
-            ||  !::strcmp(argv[i], "-startvm"))
+        /* NOTE: the check here must match the corresponding check for the
+         * options to start a VM in hardenedmain.cpp and VBoxGlobal.cpp exactly,
+         * otherwise there will be weird error messages. */
+        if (   !::strcmp(argv[i], "--startvm")
+            || !::strcmp(argv[i], "-startvm"))
         {
             fInitSUPLib = true;