Changeset 73196 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 18, 2018 10:45:52 AM (7 years ago)

Author:

vboxsync

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

123800

Message:

Fe/Qt: some more option parsing updates.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• VBoxGlobal.cpp (modified) (8 diffs)
• VBoxGlobal.h (modified) (1 diff)

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

@@ -3814 +3814 @@
 #endif
 
+    /*
+     * Parse the command line options.
+     *
+     * This is a little sloppy but we're trying to tighten it up.  Unfortuately,
+     * both on X11 and darwin (IIRC) there might be additional arguments aimed
+     * for client libraries with GUI processes.  So, using RTGetOpt or similar
+     * is a bit hard since we have to cope with unknown options.
+     */
     m_fShowStartVMErrors = true;
     bool startVM = false;
@@ -3826 +3834 @@
         const QByteArray &argBytes = arguments.at(i).toUtf8();
         const char *arg = argBytes.constData();
-        enum { OptType_Unknown, OptType_VMRunner, OptType_VMSelector } enmOptType = OptType_Unknown;
+        enum { OptType_Unknown, OptType_VMRunner, OptType_VMSelector, OptType_MaybeBoth } enmOptType = OptType_Unknown;
         /* NOTE: the check here must match the corresponding check for the
          * options to start a VM in main.cpp and hardenedmain.cpp exactly,
@@ -3848 +3856 @@
         else if (!::strcmp(arg, "-pidfile") || !::strcmp(arg, "--pidfile"))
         {
+            enmOptType = OptType_MaybeBoth;
             if (++i < argc)
                 m_strPidFile = arguments.at(i);
@@ -3854 +3863 @@
         /* Visual state type options: */
         else if (!::strcmp(arg, "-normal") || !::strcmp(arg, "--normal"))
+        {
+            enmOptType = OptType_MaybeBoth;
             visualStateType = UIVisualStateType_Normal;
+        }
         else if (!::strcmp(arg, "-fullscreen") || !::strcmp(arg, "--fullscreen"))
+        {
+            enmOptType = OptType_MaybeBoth;
             visualStateType = UIVisualStateType_Fullscreen;
+        }
         else if (!::strcmp(arg, "-seamless") || !::strcmp(arg, "--seamless"))
+        {
+            enmOptType = OptType_MaybeBoth;
             visualStateType = UIVisualStateType_Seamless;
+        }
         else if (!::strcmp(arg, "-scale") || !::strcmp(arg, "--scale"))
+        {
+            enmOptType = OptType_MaybeBoth;
             visualStateType = UIVisualStateType_Scale;
+        }
         /* Passwords: */
         else if (!::strcmp(arg, "--settingspw"))
         {
+            enmOptType = OptType_MaybeBoth;
             if (++i < argc)
             {
@@ -3872 +3894 @@
         else if (!::strcmp(arg, "--settingspwfile"))
         {
+            enmOptType = OptType_MaybeBoth;
             if (++i < argc)
             {
-                size_t cbFile;
                 const QByteArray &argFileBytes = arguments.at(i).toLocal8Bit();
                 const char *pszFile = argFileBytes.constData();
@@ -3886 +3908 @@
                 if (RT_SUCCESS(vrc))
                 {
-                    vrc = RTStrmReadEx(pStrm, m_astrSettingsPw, sizeof(m_astrSettingsPw)-1, &cbFile);
+                    size_t cbFile;
+                    vrc = RTStrmReadEx(pStrm, m_astrSettingsPw, sizeof(m_astrSettingsPw) - 1, &cbFile);
                     if (RT_SUCCESS(vrc))
                     {
-                        if (cbFile >= sizeof(m_astrSettingsPw)-1)
-                            continue;
-                        else
-                        {
-                            unsigned i;
-                            for (i = 0; i < cbFile && !RT_C_IS_CNTRL(m_astrSettingsPw[i]); i++)
-                                ;
-                            m_astrSettingsPw[i] = '\0';
-                            m_fSettingsPwSet = true;
-                        }
+                        if (cbFile >= sizeof(m_astrSettingsPw) - 1)
+                            cbFile = sizeof(m_astrSettingsPw) - 1;
+                        unsigned i;
+                        for (i = 0; i < cbFile && !RT_C_IS_CNTRL(m_astrSettingsPw[i]); i++)
+                            ;
+                        m_astrSettingsPw[i] = '\0';
+                        m_fSettingsPwSet = true;
                     }
                     if (!fStdIn)
@@ -3907 +3927 @@
         /* Misc options: */
         else if (!::strcmp(arg, "-comment") || !::strcmp(arg, "--comment"))
+        {
+            enmOptType = OptType_MaybeBoth;
             ++i;
+        }
         else if (!::strcmp(arg, "--no-startvm-errormsgbox"))
         {
@@ -3914 +3937 @@
         }
         else if (!::strcmp(arg, "--aggressive-caching"))
+        {
+            enmOptType = OptType_MaybeBoth;
             m_fAgressiveCaching = true;
+        }
         else if (!::strcmp(arg, "--no-aggressive-caching"))
+        {
+            enmOptType = OptType_MaybeBoth;
             m_fAgressiveCaching = false;
+        }
         else if (!::strcmp(arg, "--restore-current"))
         {

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -802 +802 @@
 #endif
 
-        /** Holds the --settingspw option value. */
+        /** Holds the --settingspw option value or the content of --settingspwfile. */
         char  m_astrSettingsPw[256];
         /** Holds the --settingspwfile option value. */