Changeset 26517 in vbox for trunk/src/VBox/Main/webservice

Timestamp:

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

Author:

vboxsync

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

57688

Message:

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

File:

• trunk/src/VBox/Main/webservice/vboxweb.cpp (modified) (5 diffs)

trunk/src/VBox/Main/webservice/vboxweb.cpp

@@ -32 +32 @@
 #include <VBox/version.h>
 
+#include <iprt/buildconfig.h>
 #include <iprt/thread.h>
 #include <iprt/rand.h>
@@ -143 +144 @@
 static const RTGETOPTDEF g_aOptions[]
     = {
-        { "--help",             'h', RTGETOPT_REQ_NOTHING },
+        { "--help",             'h', RTGETOPT_REQ_NOTHING }, /* for DisplayHelp() */
 #if defined(RT_OS_DARWIN) || defined(RT_OS_LINUX) || defined (RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
         { "--background",       'b', RTGETOPT_REQ_NOTHING },
@@ -588 +589 @@
     RTGETOPTUNION ValueUnion;
     RTGETOPTSTATE GetState;
-    RTGetOptInit(&GetState, argc, argv, g_aOptions, RT_ELEMENTS(g_aOptions), 1, 0 /* fFlags */);
+    RTGetOptInit(&GetState, argc, argv, g_aOptions, RT_ELEMENTS(g_aOptions), 1, 0 /*fFlags*/);
     while ((c = RTGetOpt(&GetState, &ValueUnion)))
     {
@@ -629 +630 @@
             case 'h':
                 DisplayHelp();
-                exit(0);
-            break;
+            return 0;
 
             case 'v':
@@ -641 +641 @@
             break;
 #endif
-            case VINF_GETOPT_NOT_OPTION:
-                RTStrmPrintf(g_pStdErr, "unhandled parameter: %s\n", ValueUnion.psz);
-            return 1;
+            case 'V':
+                RTPrintf("%sr%s\n", RTBldCfgVersion(), RTBldCfgRevisionStr());
+            return 0;
 
             default:
-                if (c > 0)
-                {
-                    if (RT_C_IS_GRAPH(c))
-                        RTStrmPrintf(g_pStdErr, "unhandled option: -%c", c);
-                    else
-                        RTStrmPrintf(g_pStdErr, "unhandled option: %i", c);
-                }
-                else if (c == VERR_GETOPT_UNKNOWN_OPTION)
-                    RTStrmPrintf(g_pStdErr, "unknown option: %s", ValueUnion.psz);
-                else if (ValueUnion.pDef)
-                    RTStrmPrintf(g_pStdErr, "%s: %Rrs", ValueUnion.pDef->pszLong, c);
-                else
-                    RTStrmPrintf(g_pStdErr, "%Rrs", c);
-                exit(1);
-            break;
+                rc = RTGetOptPrintError(c, &ValueUnion);
+            return rc;
         }
     }