sulogin: use bb_error_msg instead of bb_info_msg; better message

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

diff --git a/networking/zcip.c b/networking/zcip.c
index dba269bd8d604c4825db07a598dc687567576827..c930826194a3644fe0f383d994ee7c81be10f582 100644 (file)
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -176,7 +176,7 @@ static int run(char *argv[3], const char *param, uint32_t nip)
                xsetenv("ip", addr);
                fmt -= 3;
        }
-       bb_info_msg(fmt, argv[2], argv[0], addr);
+       bb_error_msg(fmt, argv[2], argv[0], addr);
 
        status = spawn_and_wait(argv + 1);
        if (status < 0) {
@@ -317,7 +317,7 @@ int zcip_main(int argc UNUSED_PARAM, char **argv)
 #if BB_MMU
                bb_daemonize(0 /*was: DAEMON_CHDIR_ROOT*/);
 #endif
-               bb_info_msg("start, interface %s", argv_intf);
+               bb_error_msg("start, interface %s", argv_intf);
        }
 
        // Run the dynamic address negotiation protocol,
@@ -345,7 +345,7 @@ int zcip_main(int argc UNUSED_PARAM, char **argv)
        state = PROBE;
        while (1) {
                struct pollfd fds[1];
-               unsigned deadline_us;
+               unsigned deadline_us = deadline_us;
                struct arp_packet p;
                int ip_conflict;
                int n;
@@ -361,8 +361,10 @@ int zcip_main(int argc UNUSED_PARAM, char **argv)
                        // make the kernel filter out all packets except
                        // ones we'd care about.
                }
-               // Set deadline_us to the point in time when we timeout
-               deadline_us = MONOTONIC_US() + timeout_ms * 1000;
+               if (timeout_ms >= 0) {
+                       // Set deadline_us to the point in time when we timeout
+                       deadline_us = MONOTONIC_US() + timeout_ms * 1000;
+               }
 
                VDBG("...wait %d %s nsent=%u\n",
                                timeout_ms, argv_intf, nsent);
@@ -387,7 +389,7 @@ int zcip_main(int argc UNUSED_PARAM, char **argv)
                                        send_arp_request(0, &null_ethaddr, chosen_nip);
                                        continue;
                                }
-                               // Switch to announce state
+                               // Switch to announce state
                                nsent = 0;
                                state = ANNOUNCE;
                                goto send_announce;