Changeset 26517 in vbox for trunk/src/VBox/HostDrivers/Support

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.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• testcase/SUPLoggerCtl.cpp (modified) (4 diffs)
• testcase/tstGIP-2.cpp (modified) (2 diffs)
• testcase/tstSupLoadModule.cpp (modified) (2 diffs)
• win/SUPSvc-win.cpp (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/testcase/SUPLoggerCtl.cpp

@@ -33 +33 @@
 *******************************************************************************/
 #include <VBox/sup.h>
+#include <iprt/buildconfig.h>
 #include <iprt/initterm.h>
 #include <iprt/getopt.h>
@@ -79 +80 @@
         { "--what",     'o', RTGETOPT_REQ_STRING },
         { "--which",    'l', RTGETOPT_REQ_STRING },
-        { "--help",     'h', 0 },
     };
 
@@ -141 +141 @@
                 return usage();
 
+            case 'V':
+                RTPrintf("%sr%s\n", RTBldCfgVersion(), RTBldCfgRevisionStr());
+                return 0;
+
             case VINF_GETOPT_NOT_OPTION:
                 RTStrmPrintf(g_pStdErr, "SUPLoggerCtl: error: Unexpected argument '%s'.\n", Val.psz);
@@ -146 +150 @@
 
             default:
-                if (ch > 0)
-                {
-                    if (RT_C_IS_GRAPH(ch))
-                        RTStrmPrintf(g_pStdErr, "SUPLoggerCtl: error: unhandled option: -%c\n", ch);
-                    else
-                        RTStrmPrintf(g_pStdErr, "SUPLoggerCtl: error: unhandled option: %i\n", ch);
-                }
-                else if (ch == VERR_GETOPT_UNKNOWN_OPTION)
-                    RTStrmPrintf(g_pStdErr, "SUPLoggerCtl: error: unknown option: %s\n", Val.psz);
-                else if (Val.pDef)
-                    RTStrmPrintf(g_pStdErr, "SUPLoggerCtl: error: %s: %Rrs\n", Val.pDef->pszLong, ch);
-                else
-                    RTStrmPrintf(g_pStdErr, "SUPLoggerCtl: error: %Rrs\n", ch);
-                return 1;
+                return RTGetOptPrintError(ch, &Val);
         }
     }

trunk/src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp

@@ -66 +66 @@
     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, RTGETOPTINIT_FLAGS_NO_STD_OPTS);
     while ((ch = RTGetOpt(&GetState, &ValueUnion)))
     {
@@ -87 +87 @@
                 break;
 
-            case VINF_GETOPT_NOT_OPTION:
-                RTPrintf("tstGIP-2: syntax error: %s\n", ValueUnion.psz);
-                return 1;
-
             default:
-                if (ch < 0)
-                    RTPrintf("tstGIP-2: %Rrc: %s\n", ch, ValueUnion.psz);
-                else
-                    RTPrintf("tstGIP-2: syntax error: %s\n", ValueUnion.psz);
-                return 1;
+                return RTGetOptPrintError(ch, &ValueUnion);
         }
     }

trunk/src/VBox/HostDrivers/Support/testcase/tstSupLoadModule.cpp

@@ -61 +61 @@
     static const RTGETOPTDEF s_aOptions[] =
     {
-        { "--help",             'h', 0 }
+        { "--help",             'h', RTGETOPT_REQ_NOTHING } /* (dummy entry) */
     };
 
@@ -96 +96 @@
                 return 1;
 
+            case 'V':
+                RTPrintf("$Revision$\n");
+                return 0;
+
             default:
                 return RTGetOptPrintError(ch, &ValueUnion);

trunk/src/VBox/HostDrivers/Support/win/SUPSvc-win.cpp

@@ -270 +270 @@
     RTGETOPTUNION Value;
     RTGETOPTSTATE GetState;
-    RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 0, 0 /* fFlags*/);
+    RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 0, RTGETOPTINIT_FLAGS_NO_STD_OPTS);
     while ((ch = RTGetOpt(&GetState, &Value)))
         switch (ch)