zcip: fix unaligned trap on ARM

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

diff --git a/networking/ether-wake.c b/networking/ether-wake.c
index ed41590aa28d32c26b991272cc8fd36de427c960..fc26ad07d127e5214dfdf8237077f72e48c93b31 100644 (file)
--- a/networking/ether-wake.c
+++ b/networking/ether-wake.c
@@ -70,7 +70,7 @@
 #include <netinet/ether.h>
 #include <linux/if.h>
 
-#include "busybox.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
@@ -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) puts("");
+               if (i % 20 == 19) bb_putchar('\n');
        }
        printf("\n\n");
 }
@@ -195,7 +195,7 @@ int ether_wake_main(int argc, char **argv)
 
        /* handle misc user options */
        opt_complementary = "=1";
-       flags = getopt32(argc, argv, "bi:p:", &ifname, &pass);
+       flags = getopt32(argv, "bi:p:", &ifname, &pass);
        if (flags & 4) /* -p */
                wol_passwd_sz = get_wol_pw(pass, wol_passwd);
        flags &= 1; /* we further interested only in -b [bcast] flag */
@@ -220,8 +220,7 @@ int ether_wake_main(int argc, char **argv)
                struct ifreq if_hwaddr;
 
                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);
+               ioctl_or_perror_and_die(s, SIOCGIFHWADDR, &if_hwaddr, "SIOCGIFHWADDR on %s failed", ifname);
 
                memcpy(outpack+6, if_hwaddr.ifr_hwaddr.sa_data, 6);
 
@@ -257,8 +256,7 @@ int ether_wake_main(int argc, char **argv)
        {
                struct ifreq ifr;
                strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
-               if (ioctl(s, SIOCGIFINDEX, &ifr) != 0)
-                       bb_perror_msg_and_die("SIOCGIFINDEX");
+               xioctl(s, SIOCGIFINDEX, &ifr);
                memset(&whereto, 0, sizeof(whereto));
                whereto.sll_family = AF_PACKET;
                whereto.sll_ifindex = ifr.ifr_ifindex;