Changeset 32205 in vbox for trunk/src/VBox

Timestamp:

Sep 2, 2010 2:10:14 PM (14 years ago)

Author:

vboxsync

Message:

VBoxControl: More cleanup.

File:

• trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp (modified) (9 diffs)

trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp

@@ -66 +66 @@
 
 /** Enumerate the different parts of the usage we might want to print out */
-enum g_eUsage
+enum VBoxControlUsage
 {
 #ifdef RT_OS_WINDOWS
@@ -85 +85 @@
 };
 
-static void usage(g_eUsage eWhich = USAGE_ALL)
+static void usage(enum VBoxControlUsage eWhich = USAGE_ALL)
 {
     RTPrintf("Usage:\n\n");
@@ -131 +131 @@
  * Displays an error message.
  *
- * @param   pszFormat   The message text.
+ * @returns RTEXITCODE_FAILURE.
+ * @param   pszFormat   The message text. No newline.
  * @param   ...         Format arguments.
  */
-static void VBoxControlError(const char *pszFormat, ...)
-{
-    // RTStrmPrintf(g_pStdErr, "%s: error: ", g_pszProgName);
-
+static RTEXITCODE VBoxControlError(const char *pszFormat, ...)
+{
     va_list va;
     va_start(va, pszFormat);
-    RTStrmPrintfV(g_pStdErr, pszFormat, va);
+    RTMsgErrorV(pszFormat, va);
     va_end(va);
+    return RTEXITCODE_FAILURE;
+}
+
+
+/**
+ * Displays an syntax error message.
+ *
+ * @returns RTEXITCODE_FAILURE.
+ * @param   pszFormat   The message text. No newline.
+ * @param   ...         Format arguments.
+ */
+static RTEXITCODE VBoxControlSyntaxError(const char *pszFormat, ...)
+{
+    va_list va;
+    va_start(va, pszFormat);
+    RTMsgErrorV(pszFormat, va);
+    va_end(va);
+    return RTEXITCODE_FAILURE;
 }
 
@@ -805 +822 @@
             || (bpp != 32)))
     {
-        VBoxControlError("Error: invalid mode specified!\n");
+        VBoxControlError("invalid mode specified!\n");
         return RTEXITCODE_FAILURE;
     }
@@ -1349 +1366 @@
  * @returns 0 on success, 1 on failure
  * @note see the command line API description for parameters
+ *      (r=bird: yeah, right. The API description contains nil about params)
  */
 static RTEXITCODE handleSharedFolder(int argc, char *argv[])
@@ -1364 +1382 @@
 }
 #endif
+
+static RTEXITCODE handleVersion(int argc, char *argv[])
+{
+    if (argc)
+        return VBoxControlSyntaxError("getversion does not take any arguments");
+    RTPrintf("%sr%u\n", VBOX_VERSION_STRING, RTBldCfgRevision());
+    return RTEXITCODE_SUCCESS;
+}
+
+static RTEXITCODE handleHelp(int argc, char *argv[])
+{
+    /* ignore arguments for now. */
+    usage();
+    return RTEXITCODE_SUCCESS;
+}
 
 /** command handler type */
@@ -1390 +1423 @@
     { "sharedfolder",           handleSharedFolder },
 #endif
-    { NULL,                     NULL }  /* unnecessary terminator entry */
+    { "getversion",             handleVersion },
+    { "version",                handleVersion },
+    { "help",                   handleHelp }
 };
 
@@ -1424 +1459 @@
             || !strcmp(argv[iArg], "--version")
             || !strcmp(argv[iArg], "-version")
-            || !strcmp(argv[iArg], "getversion")
            )
             {
@@ -1501 +1535 @@
         if (argc > iArg)
         {
-            /** Is next parameter a known command? */
-            bool found = false;
-            /** And if so, what is its position in the table? */
-            unsigned index = 0;
-            while (   index < RT_ELEMENTS(g_aCommandHandlers)
-                   && !found
-                   && (g_aCommandHandlers[index].pszCommand != NULL))
-            {
-                if (!strcmp(argv[iArg], g_aCommandHandlers[index].pszCommand))
-                    found = true;
-                else
-                    ++index;
-            }
-            if (found)
-                rcExit = g_aCommandHandlers[index].pfnHandler(argc - iArg - 1, argv + iArg + 1);
-            else
+            /*
+             * Try locate the command and execute it, complain if not found.
+             */
+            unsigned i;
+            for (i = 0; i < RT_ELEMENTS(g_aCommandHandlers); i++)
+                if (!strcmp(argv[iArg], g_aCommandHandlers[i].pszCommand))
+                {
+                    rcExit = g_aCommandHandlers[i].pfnHandler(argc - iArg - 1, argv + iArg + 1);
+                    break;
+                }
+            if (i >= RT_ELEMENTS(g_aCommandHandlers))
             {
                 rcExit = RTEXITCODE_FAILURE;