Changeset 19532 in vbox

Timestamp:

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

Author:

vboxsync

Message:

VBoxService/common: Backed cmd line changes; won't work.

File:

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

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

@@ -396 +396 @@
     {
         const char *psz = argv[i];
-
-        /* Translate long argument to short. */
-        if (*psz+1 == '-')
+        if (*psz != '-')
+            return VBoxServiceSyntax("Unknown argument '%s'\n", psz);
+        psz++;
+
+        /* translate long argument to short */
+        if (*psz == '-')
         {
             psz++;
@@ -447 +450 @@
                             return rc;
                     }
+                if (!fFound)
+                    return VBoxServiceSyntax("Unknown option '%s'\n", argv[i]);
                 continue;
             }
 #undef MATCHES
         }
-        else if (*psz == '-')
+
+        /* handle the string of short options. */
+        do
         {
-            /* Handle the string of short options. */
-            do
+            switch (*psz)
             {
-                switch (*psz)
+                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:
                 {
-                    case 'i':
-                        rc = VBoxServiceArgUInt32(argc, argv, psz + 1, &i,
-                                                  &g_DefaultInterval, 1, (UINT32_MAX / 1000) - 1);
-                        if (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;
-                        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:
-                    {
-                        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;
                     }
+                    if (!fFound)
+                        return VBoxServiceSyntax("Unknown option '%c' (%s)\n", *psz, argv[i]);
+                    break;
                 }
-            } while (psz && *++psz);
-        }
-        else
-        {
-            /* @todo put in here commands without dashes (- or --). */
-        }
+            }
+        } while (psz && *++psz);
     }