Changeset 28371 in vbox

Timestamp:

Apr 15, 2010 3:02:36 PM (15 years ago)

Author:

vboxsync

Message:

NetworkServices: branding and cosmetical fixes

Location:

trunk/src/VBox/NetworkServices

Files:

• DHCP/VBoxNetDHCP.cpp (modified) (2 diffs)
• NAT/VBoxNetNAT.cpp (modified) (1 diff)
• NetLib/VBoxNetBaseService.cpp (modified) (3 diffs)

trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp

@@ -45 +45 @@
 #include <VBox/intnetinline.h>
 #include <VBox/vmm.h>
+#include <VBox/version.h>
 
 #include "../NetLib/VBoxNetLib.h"
@@ -820 +821 @@
             case 'h':
                 RTPrintf("VBoxNetDHCP Version %s\n"
-                         "(C) 2009 Sun Microsystems, Inc.\n"
-                         "All rights reserved\n"
+                         "(C) 2009-" VBOX_C_YEAR " " VBOX_VENDOR "\n"
+                         "All rights reserved.\n"
                          "\n"
                          "Usage: VBoxNetDHCP <options>\n"

trunk/src/VBox/NetworkServices/NAT/VBoxNetNAT.cpp

@@ -336 +336 @@
     g_pNAT = new VBoxNetNAT();
     Log2(("NAT: parsing command line\n"));
-    g_pNAT->parseArgs(argc - 1, argv + 1);
-    Log2(("NAT: initialization\n"));
-    g_pNAT->init();
-    Log2(("NAT: try go online\n"));
-    g_pNAT->tryGoOnline();
-    Log2(("NAT: main loop\n"));
-    g_pNAT->run();
+    int rc = g_pNAT->parseArgs(argc - 1, argv + 1);
+    if (!rc)
+    {
+        Log2(("NAT: initialization\n"));
+        g_pNAT->init();
+        Log2(("NAT: try go online\n"));
+        g_pNAT->tryGoOnline();
+        Log2(("NAT: main loop\n"));
+        g_pNAT->run();
+    }
     delete g_pNAT;
     return 0;

trunk/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.cpp

@@ -47 +47 @@
 #include <VBox/intnet.h>
 #include <VBox/vmm.h>
+#include <VBox/version.h>
 
 #include <vector>
@@ -175 +176 @@
             case 'V':
                 RTPrintf("%sr%u\n", RTBldCfgVersion(), RTBldCfgRevision());
-                return 0;
+                return 1;
 
             case 'h':
                 RTPrintf("VBoxNetDHCP Version %s\n"
-                         "(C) 2009 Sun Microsystems, Inc.\n"
-                         "All rights reserved\n"
+                         "(C) 2009-" VBOX_C_YEAR " " VBOX_VENDOR "\n"
+                         "All rights reserved.\n"
                          "\n"
                          "Usage: VBoxNetDHCP <options>\n"
@@ -191 +192 @@
                 return 1;
 
-            case VERR_GETOPT_UNKNOWN_OPTION:
-            case VINF_GETOPT_NOT_OPTION:
-                RTPrintf("Unknown option '%s'. Use --help for more information.\n", Val.psz);
-                return 1;
-
             default:
-                break;
+                rc = RTGetOptPrintError(rc, &Val);
+                RTPrintf("Use --help for more information.\n");
+                return rc;
         }
     }