Changeset 52927 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Oct 2, 2014 11:34:37 AM (10 years ago)

Author:

vboxsync

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

96364

Message:

VBoxManage: disable short options to "debugvm ... log" so that log
specificacations like "-drv_nat.l2" don't send it into infinite loop.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageDebugVM.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageDebugVM.cpp

@@ -168 +168 @@
     RTGETOPTUNION               ValueUnion;
 
-    /** @todo Put short options into enum / defines! */
+    /*
+     * NB: don't use short options to prevent log specifications like
+     * "-drv_foo" from being interpreted as options.
+     */
+#   define DEBUGVM_LOG_DEBUG       (VINF_GETOPT_NOT_OPTION + 'd')
+#   define DEBUGVM_LOG_RELEASE     (VINF_GETOPT_NOT_OPTION + 'r')
+
     static const RTGETOPTDEF    s_aOptions[] =
     {
-        { "--debug",        'd', RTGETOPT_REQ_NOTHING },
-        { "--release",      'r', RTGETOPT_REQ_NOTHING }
+        { "--debug",        DEBUGVM_LOG_DEBUG,   RTGETOPT_REQ_NOTHING },
+        { "--release",      DEBUGVM_LOG_RELEASE, RTGETOPT_REQ_NOTHING }
     };
     int rc = RTGetOptInit(&GetState, pArgs->argc, pArgs->argv, s_aOptions, RT_ELEMENTS(s_aOptions), 2, RTGETOPTINIT_FLAGS_OPTS_FIRST);
@@ -181 +187 @@
         switch (rc)
         {
-            case 'r':
+            case DEBUGVM_LOG_RELEASE:
                 fRelease = true;
                 break;
 
-            case 'd':
+            case DEBUGVM_LOG_DEBUG:
                 fRelease = false;
                 break;