Changeset 71306 in vbox for trunk/src/VBox/NetworkServices/Dhcpd

Timestamp:

Mar 13, 2018 1:25:43 AM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

121244

Message:

NetworkServices/Dhcpd: getopt improvements.

File:

• trunk/src/VBox/NetworkServices/Dhcpd/Config.cpp (modified) (5 diffs)

trunk/src/VBox/NetworkServices/Dhcpd/Config.cpp

@@ -20 +20 @@
 #include <iprt/getopt.h>
 #include <iprt/path.h>
+#include <iprt/message.h>
 #include <iprt/string.h>
 
@@ -95 +96 @@
 
 /* compatibility with old VBoxNetDHCP */
-static RTGETOPTDEF g_aCompatOptions[] =
+static const RTGETOPTDEF g_aCompatOptions[] =
 {
     { "--ip-address",     'i',   RTGETOPT_REQ_IPV4ADDR },
@@ -114 +115 @@
 
     rc = RTGetOptInit(&State, argc, argv,
-                      g_aCompatOptions, RT_ELEMENTS(g_aCompatOptions), 0,
+                      g_aCompatOptions, RT_ELEMENTS(g_aCompatOptions), 1,
                       RTGETOPTINIT_FLAGS_NO_STD_OPTS);
+    AssertRCReturn(rc, NULL);
 
     std::unique_ptr<Config> config(new Config());
@@ -162 +164 @@
                     config->m_enmTrunkType = kIntNetTrunkType_NetAdp;
                 else
+                {
+                    RTMsgError("Unknown trunk type '%s'", Val.psz);
                     return NULL;
+                }
                 break;
 
@@ -168 +173 @@
                 config->m_IPv4PoolLast = Val.IPv4Addr;
                 break;
+
+            case VINF_GETOPT_NOT_OPTION:
+                RTMsgError("%s: Unexpected command line argument", Val.psz);
+                return NULL;
+
+            default:
+                RTGetOptPrintError(rc, &Val);
+                return NULL;
         }
     }