Changeset 26517 in vbox for trunk/src/VBox/Frontends/VBoxHeadless

Timestamp:

Feb 14, 2010 9:39:00 PM (15 years ago)

Author:

vboxsync

Message:

*: RTGetOpt cleanup related to --help and --version (now standard option). Use RTGetOptPrintError.

File:

• trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp (modified) (10 diffs)

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -39 +39 @@
 # include <VBox/vrdpapi.h>
 #endif
+#include <iprt/buildconfig.h>
 #include <iprt/ctype.h>
 #include <iprt/initterm.h>
@@ -681 +682 @@
         { "--capture", 'c', 0 },
         { "--width", 'w', RTGETOPT_REQ_UINT32 },
-        { "--height", 'h', RTGETOPT_REQ_UINT32 },
+        { "--height", 'h', RTGETOPT_REQ_UINT32 }, /* great choice of short option! */
         { "--bitrate", 'r', RTGETOPT_REQ_UINT32 },
         { "--filename", 'f', RTGETOPT_REQ_STRING },
@@ -746 +747 @@
                 ulFrameWidth = ValueUnion.u32;
                 break;
-            case 'h':
-                ulFrameHeight = ValueUnion.u32;
-                break;
             case 'r':
                 ulBitRate = ValueUnion.u32;
@@ -756 +754 @@
                 break;
 #endif /* VBOX_FFMPEG defined */
-            case VINF_GETOPT_NOT_OPTION:
-                RTPrintf("Invalid parameter '%s'\n\n", ValueUnion.psz);
+            case 'h':
+#ifdef VBOX_FFMPEG
+                if ((GetState.pDef->fFlags & RTGETOPT_REQ_MASK) != RTGETOPT_REQ_NOTHING)
+                {
+                    ulFrameHeight = ValueUnion.u32;
+                    break;
+                }
+#endif
                 show_usage();
-                return -1;
+                return 0;
             case OPT_COMMENT:
                 /* nothing to do */
                 break;
+            case 'V':
+                RTPrintf("%sr%s\n", RTBldCfgVersion(), RTBldCfgRevisionStr());
+                return 0;
             default:
-                if (ch > 0)
-                {
-                    if (RT_C_IS_PRINT(ch))
-                        RTPrintf("Invalid option -%c\n\n", ch);
-                    else
-                        RTPrintf("Invalid option case %i\n\n", ch);
-                }
-                else if (ch == VERR_GETOPT_UNKNOWN_OPTION)
-                    RTPrintf("Unknown option: %s\n\n", ValueUnion.psz);
-                else if (ValueUnion.pDef)
-                    RTPrintf("%s: %Rrs\n\n", ValueUnion.pDef->pszLong, ch);
-                else
-                    RTPrintf("Error: %Rrs\n\n", ch);
+                ch = RTGetOptPrintError(ch, &ValueUnion);
                 show_usage();
-                return -1;
+                return ch;
         }
     }
@@ -786 +781 @@
     {
         LogError("VBoxHeadless: ERROR: please specify an even frame width between 512 and 2048", 0);
-        return -1;
+        return 1;
     }
     if (ulFrameHeight < 384 || ulFrameHeight > 1536 || ulFrameHeight % 2)
     {
         LogError("VBoxHeadless: ERROR: please specify an even frame height between 384 and 1536", 0);
-        return -1;
+        return 1;
     }
     if (ulBitRate < 300000 || ulBitRate > 1000000)
     {
         LogError("VBoxHeadless: ERROR: please specify an even bitrate between 300000 and 1000000", 0);
-        return -1;
+        return 1;
     }
     /* Make sure we only have %d or %u (or none) in the file name specified */
@@ -803 +798 @@
     {
         LogError("VBoxHeadless: ERROR: Only %%d and %%u are allowed in the capture file name.", -1);
-        return -1;
+        return 1;
     }
     /* And no more than one % in the name */
@@ -809 +804 @@
     {
         LogError("VBoxHeadless: ERROR: Only one format modifier is allowed in the capture file name.", -1);
-        return -1;
+        return 1;
     }
     RTStrPrintf(&pszMPEGFile[0], RTPATH_MAX, pszFileNameParam, RTProcSelf());
@@ -817 +812 @@
     {
         show_usage();
-        return -1;
+        return 1;
     }
 
@@ -826 +821 @@
     {
         RTPrintf("VBoxHeadless: ERROR: failed to initialize COM!\n");
-        return rc;
+        return 1;
     }
 
@@ -1172 +1167 @@
     LogFlow(("VBoxHeadless FINISHED.\n"));
 
-    return rc;
+    return FAILED(rc) ? 1 : 0;
 }