Changeset 18626 in vbox for trunk/src/VBox

Timestamp:

Apr 2, 2009 10:58:55 AM (16 years ago)

Author:

vboxsync

Message:

VBoxHeadless: better handling of command line failure

File:

• trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -39 +39 @@
 # include <VBox/vrdpapi.h>
 #endif
+#include <iprt/ctype.h>
 #include <iprt/initterm.h>
 #include <iprt/stream.h>
@@ -70 +71 @@
     do { \
         Log (("VBoxHeadless: ERROR: " m " [rc=0x%08X]\n", rc)); \
-        RTPrintf ("%s", m); \
+        RTPrintf ("%s\n", m); \
     } while (0)
 
@@ -514 +515 @@
     while ((ch = RTGetOpt(&GetState, &ValueUnion)))
     {
-        if (ch < 0)
-        {
-            show_usage();
-            exit(-1);
-        }
         switch(ch)
         {
@@ -580 +576 @@
 #endif /* VBOX_FFMPEG defined */
             case VINF_GETOPT_NOT_OPTION:
-                /* ignore */
-                break;
-            default: /* comment */
-                /** @todo If we would not ignore this, that would be really really nice... */
-                break;
+                RTPrintf("Invalid parameter '%s'\n\n", ValueUnion.psz);
+                show_usage();
+                return -1;
+            default:
+                if (ch > 0)
+                {
+                    if (RT_C_IS_PRINT(ch))
+                        RTPrintf("Invalid option -%c\n\n", ch);
+                    else
+                        RTPrintf("Invalid option case %i", ch);
+                }
+                else if (ch == VERR_GETOPT_UNKNOWN_OPTION)
+                    RTPrintf("Unknown option: %s\n\n", ValueUnion.psz);
+                else if (ValueUnion.pDef)
+                    RTPrintf("%s: %Rrs\n\n", ValueUnion.pDef->pszLong, ch);
+                else
+                    RTPrintf("Error: %Rrs", ch);
+                show_usage();
+                return -1;
         }
     }