#if HAVE_AFINET6 -> #ifdef HAVE_AFINET6

[oweals/busybox.git] / networking / zcip.c

diff --git a/networking/zcip.c b/networking/zcip.c
index 5d2a5f78646cfa2d19dde1398e9e8db41260396b..27e281c93266c904b2771dd5d7311466d4116211 100644 (file)
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -24,14 +24,9 @@
 // - link status monitoring (restart on link-up; stop on link-down)
 
 #include "busybox.h"
-#include <errno.h>
-#include <string.h>
 #include <syslog.h>
 #include <poll.h>
-#include <time.h>
-
 #include <sys/wait.h>
-
 #include <netinet/ether.h>
 #include <net/ethernet.h>
 #include <net/if.h>
@@ -75,7 +70,7 @@ enum {
 #define VDBG(fmt,args...) \
        do { } while (0)
 
-static unsigned long opts;
+static unsigned opts;
 #define FOREGROUND (opts & 1)
 #define QUIT (opts & 2)
 
@@ -217,12 +212,12 @@ int zcip_main(int argc, char *argv[])
 
        // parse commandline: prog [options] ifname script
        char *r_opt;
-       bb_opt_complementally = "vv:vf"; // -v accumulates and implies -f
-       opts = bb_getopt_ulflags(argc, argv, "fqr:v", &r_opt, &verbose);
+       opt_complementary = "vv:vf"; // -v accumulates and implies -f
+       opts = getopt32(argc, argv, "fqr:v", &r_opt, &verbose);
        if (!FOREGROUND) {
                /* Do it early, before all bb_xx_msg calls */
                logmode = LOGMODE_SYSLOG;
-               openlog(bb_applet_name, 0, LOG_DAEMON);
+               openlog(applet_name, 0, LOG_DAEMON);
        }
        if (opts & 4) { // -r n.n.n.n
                if (inet_aton(r_opt, &ip) == 0
@@ -314,7 +309,7 @@ int zcip_main(int argc, char *argv[])
                        tv1.tv_sec++;
                }
                tv1.tv_sec += timeout / 1000;
-       
+
                VDBG("...wait %ld %s nprobes=%d, nclaims=%d\n",
                                timeout, intf, nprobes, nclaims);
                switch (poll(fds, 1, timeout)) {
@@ -479,7 +474,7 @@ int zcip_main(int argc, char *argv[])
                                target_ip_conflict = 1;
                        }
 
-                       VDBG("state = %d, source ip conflict = %d, target ip conflict = %d\n", 
+                       VDBG("state = %d, source ip conflict = %d, target ip conflict = %d\n",
                                state, source_ip_conflict, target_ip_conflict);
                        switch (state) {
                        case PROBE: