Changeset 41754 in vbox

Timestamp:

Jun 15, 2012 1:03:05 PM (13 years ago)

Author:

vboxsync

Message:

VBoxManage/DebugVM: Fixed "--debug" parameter, fixed parameter settings for log, logdest and logflags.

File:

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

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -169 +169 @@
     RTGETOPTSTATE               GetState;
     RTGETOPTUNION               ValueUnion;
+
+    /** @todo Put short options into enum / defines! */
     static const RTGETOPTDEF    s_aOptions[] =
     {
-        { "--release",      'r', RTGETOPT_REQ_NOTHING },
+        { "--debug",        'd', RTGETOPT_REQ_NOTHING },
+        { "--release",      'r', RTGETOPT_REQ_NOTHING }
     };
-    int rc = RTGetOptInit(&GetState, pArgs->argc, pArgs->argv, s_aOptions, RT_ELEMENTS(s_aOptions), 2, 0 /*fFlags*/);
+    int rc = RTGetOptInit(&GetState, pArgs->argc, pArgs->argv, s_aOptions, RT_ELEMENTS(s_aOptions), 2, RTGETOPTINIT_FLAGS_OPTS_FIRST);
     AssertRCReturn(rc, RTEXITCODE_FAILURE);
 
@@ -188 +191 @@
                 break;
 
-            case VINF_GETOPT_NOT_OPTION:
+            /* Because log strings can start with "-" (like "-all+dev_foo")
+             * we have to take everything we got as a setting and apply it.
+             * IPRT will take care of the validation afterwards. */
+            default:
                 if (strSettings.length() == 0)
                     strSettings = ValueUnion.psz;
@@ -197 +203 @@
                 }
                 break;
-
-            default:
-                return errorGetOpt(USAGE_DEBUGVM, rc, &ValueUnion);
         }
     }