udhcpc: reuse string constant; remove unneeded memset(0)

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

diff --git a/networking/ether-wake.c b/networking/ether-wake.c
index 36713837a481b349e3bace7b09166158e4023bc9..6a88279f4ee42d9705928604215e1c5a5c676f3d 100644 (file)
--- a/networking/ether-wake.c
+++ b/networking/ether-wake.c
@@ -2,7 +2,7 @@
 /*
  * ether-wake.c - Send a magic packet to wake up sleeping machines.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  * Author:      Donald Becker, http://www.scyld.com/"; http://www.scyld.com/wakeonlan.html
  * Busybox port: Christian Volkmann <haveaniceday@online.de>
@@ -64,14 +64,21 @@
  *   filter.  That configuration consumes more power.
 */
 
+//usage:#define ether_wake_trivial_usage
+//usage:       "[-b] [-i iface] [-p aa:bb:cc:dd[:ee:ff]] MAC"
+//usage:#define ether_wake_full_usage "\n\n"
+//usage:       "Send a magic packet to wake up sleeping machines.\n"
+//usage:       "MAC must be a station address (00:11:22:33:44:55) or\n"
+//usage:       "a hostname with a known 'ethers' entry.\n"
+//usage:     "\n       -b              Send wake-up packet to the broadcast address"
+//usage:     "\n       -i iface        Interface to use (default eth0)"
+//usage:     "\n       -p pass         Append four or six byte password PW to the packet"
 
+#include "libbb.h"
 #include <netpacket/packet.h>
-#include <net/ethernet.h>
 #include <netinet/ether.h>
 #include <linux/if.h>
 
-#include "libbb.h"
-
 /* Note: PF_INET, SOCK_DGRAM, IPPROTO_UDP would allow SIOCGIFHWADDR to
  * work as non-root, but we need SOCK_PACKET to specify the Ethernet
  * destination address.
@@ -92,7 +99,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) puts("");
+               if (i % 20 == 19) bb_putchar('\n');
        }
        printf("\n\n");
 }
@@ -111,16 +118,19 @@ static void get_dest_addr(const char *hostid, struct ether_addr *eaddr)
 {
        struct ether_addr *eap;
 
-       eap = ether_aton(hostid);
+       eap = ether_aton_r(hostid, eaddr);
        if (eap) {
-               *eaddr = *eap;
-               bb_debug_msg("The target station address is %s\n\n", ether_ntoa(eaddr));
-#if !defined(__UCLIBC__)
+               bb_debug_msg("The target station address is %s\n\n", ether_ntoa(eap));
+#if !defined(__UCLIBC_MAJOR__) \
+ || __UCLIBC_MAJOR__ > 0 \
+ || __UCLIBC_MINOR__ > 9 \
+ || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ >= 30)
        } else if (ether_hostton(hostid, eaddr) == 0) {
                bb_debug_msg("Station address for hostname %s is %s\n\n", hostid, ether_ntoa(eaddr));
 #endif
-       } else
+       } else {
                bb_show_usage();
+       }
 }
 
 static int get_fill(unsigned char *pkt, struct ether_addr *eaddr, int broadcast)
@@ -164,7 +174,7 @@ static int get_wol_pw(const char *ethoptarg, unsigned char *wol_passwd)
                byte_cnt = sscanf(ethoptarg, "%u.%u.%u.%u",
                                  &passwd[0], &passwd[1], &passwd[2], &passwd[3]);
        if (byte_cnt < 4) {
-               bb_error_msg("cannot read Wake-On-LAN pass");
+               bb_error_msg("can't read Wake-On-LAN pass");
                return 0;
        }
 // TODO: check invalid numbers >255??
@@ -178,20 +188,20 @@ static int get_wol_pw(const char *ethoptarg, unsigned char *wol_passwd)
        return byte_cnt;
 }
 
-int ether_wake_main(int argc, char **argv);
-int ether_wake_main(int argc, char **argv)
+int ether_wake_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ether_wake_main(int argc UNUSED_PARAM, char **argv)
 {
        const char *ifname = "eth0";
        char *pass;
        unsigned flags;
        unsigned char wol_passwd[6];
        int wol_passwd_sz = 0;
-       int s;                                          /* Raw socket */
+       int s;  /* Raw socket */
        int pktsize;
        unsigned char outpack[1000];
 
        struct ether_addr eaddr;
-       struct whereto_t whereto;       /* who to wake up */
+       struct whereto_t whereto;  /* who to wake up */
 
        /* handle misc user options */
        opt_complementary = "=1";
@@ -219,7 +229,7 @@ int ether_wake_main(int argc, char **argv)
        {
                struct ifreq if_hwaddr;
 
-               strncpy(if_hwaddr.ifr_name, ifname, sizeof(if_hwaddr.ifr_name));
+               strncpy_IFNAMSIZ(if_hwaddr.ifr_name, ifname);
                ioctl_or_perror_and_die(s, SIOCGIFHWADDR, &if_hwaddr, "SIOCGIFHWADDR on %s failed", ifname);
 
                memcpy(outpack+6, if_hwaddr.ifr_hwaddr.sa_data, 6);
@@ -255,7 +265,7 @@ int ether_wake_main(int argc, char **argv)
 #if defined(PF_PACKET)
        {
                struct ifreq ifr;
-               strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+               strncpy_IFNAMSIZ(ifr.ifr_name, ifname);
                xioctl(s, SIOCGIFINDEX, &ifr);
                memset(&whereto, 0, sizeof(whereto));
                whereto.sll_family = AF_PACKET;