rt_names: stop allocating 5k in rwdata

[oweals/busybox.git] / networking / ether-wake.c

diff --git a/networking/ether-wake.c b/networking/ether-wake.c
index f4ca889fafc55a6a32505a099f0be39a51618c35..e205ffc00073adca716ba4dad25eb78b8d22a7a1 100644 (file)
--- a/networking/ether-wake.c
+++ b/networking/ether-wake.c
@@ -92,7 +92,7 @@ void bb_debug_dump_packet(unsigned char *outpack, int pktsize)
        printf("packet dump:\n");
        for (i = 0; i < pktsize; ++i) {
                printf("%2.2x ", outpack[i]);
-               if (i % 20 == 19) printf("\n");
+               if (i % 20 == 19) puts("");
        }
        printf("\n\n");
 }
@@ -120,7 +120,7 @@ int ether_wake_main(int argc, char *argv[])
        struct whereto_t whereto;       /* who to wake up */
 
        /* handle misc user options */
-       flags = bb_getopt_ulflags(argc, argv, "bi:p:", &ifname, &pass);
+       flags = getopt32(argc, argv, "bi:p:", &ifname, &pass);
        if (optind == argc)
                bb_show_usage();
        if (pass)
@@ -145,7 +145,7 @@ int ether_wake_main(int argc, char *argv[])
        {
                struct ifreq if_hwaddr;
 
-               strcpy(if_hwaddr.ifr_name, ifname);
+               strncpy(if_hwaddr.ifr_name, ifname, sizeof(if_hwaddr.ifr_name));
                if (ioctl(s, SIOCGIFHWADDR, &if_hwaddr) < 0)
                        bb_perror_msg_and_die("SIOCGIFHWADDR on %s failed", ifname);
 
@@ -175,8 +175,7 @@ int ether_wake_main(int argc, char *argv[])
 
        /* This is necessary for broadcasts to work */
        if (flags /*& 1 [OPT_BROADCAST]*/) {
-               int one = 1;
-               if (setsockopt(s, SOL_SOCKET, SO_BROADCAST, (void *)&one, sizeof(one)) < 0)
+               if (setsockopt_broadcast(s) < 0)
                        bb_perror_msg("SO_BROADCAST");
        }
 
@@ -270,7 +269,7 @@ static inline int get_wol_pw(const char *ethoptarg, unsigned char *wol_passwd)
                byte_cnt = sscanf(ethoptarg, "%d.%d.%d.%d",
                                  &passwd[0], &passwd[1], &passwd[2], &passwd[3]);
        if (byte_cnt < 4) {
-               bb_error_msg("Unable to read the Wake-On-LAN pass");
+               bb_error_msg("cannot read Wake-On-LAN pass");
                return 0;
        }