Changeset 19526 in vbox

Timestamp:

May 8, 2009 2:06:35 PM (16 years ago)

Author:

vboxsync

Message:

VBoxService/common: Bugfix for cmd line.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp (modified) (3 diffs)

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

@@ -396 +396 @@
     {
         const char *psz = argv[i];
-        if (*psz != '-')
-            return VBoxServiceSyntax("Unknown argument '%s'\n", psz);
-        psz++;
-
-        /* translate long argument to short */
-        if (*psz == '-')
+
+        /* Translate long argument to short. */
+        if (*psz+1 == '-')
         {
             psz++;
@@ -444 +441 @@
                     {
                         rc = g_aServices[j].pDesc->pfnOption(NULL, argc, argv, &i);
-                        if (rc != 0)
+                        fFound = rc == 0;
+                        if (fFound)
+                            break;
+                        if (rc != -1)
                             return rc;
                     }
@@ -451 +451 @@
 #undef MATCHES
         }
-
-        /* handle the string of short options. */
-        do
+        else if (*psz == '-')
         {
-            switch (*psz)
+            /* Handle the string of short options. */
+            do
             {
-                case 'i':
-                    rc = VBoxServiceArgUInt32(argc, argv, psz + 1, &i,
-                                              &g_DefaultInterval, 1, (UINT32_MAX / 1000) - 1);
-                    if (rc)
-                        return rc;
-                    psz = NULL;
-                    break;
-
-                case 'f':
-                    fDaemonize = false;
-                    break;
-
-                case 'v':
-                    g_cVerbosity++;
-                    break;
-
-                case 'h':
-                case '?':
-                    return VBoxServiceUsage();
-
-#ifdef RT_OS_WINDOWS
-                case 'r':
-                    return VBoxServiceWinInstall();
-
-                case 'u':
-                    return VBoxServiceWinUninstall();
-#endif
-
-                default:
+                switch (*psz)
                 {
-                    for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
+                    case 'i':
+                        rc = VBoxServiceArgUInt32(argc, argv, psz + 1, &i,
+                                                  &g_DefaultInterval, 1, (UINT32_MAX / 1000) - 1);
+                        if (rc)
+                            return rc;
+                        psz = NULL;
+                        break;
+
+                    case 'f':
+                        fDaemonize = false;
+                        break;
+
+                    case 'v':
+                        g_cVerbosity++;
+                        break;
+
+                    case 'h':
+                    case '?':
+                        return VBoxServiceUsage();
+
+    #ifdef RT_OS_WINDOWS
+                    case 'r':
+                        return VBoxServiceWinInstall();
+
+                    case 'u':
+                        return VBoxServiceWinUninstall();
+    #endif
+
+                    default:
                     {
-                        rc = g_aServices[j].pDesc->pfnOption(&psz, argc, argv, &i);
-                        if (rc != 0)
-                            return rc;
+                        bool fFound = false;
+                        for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
+                        {
+                            rc = g_aServices[j].pDesc->pfnOption(&psz, argc, argv, &i);
+                            fFound = rc == 0;
+                            if (fFound)
+                                break;
+                            if (rc != -1)
+                                return rc;
+                        }
+                        break;
                     }
-                    break;
                 }
-            }
-        } while (psz && *++psz);
+            } while (psz && *++psz);
+        }
     }