- sed -e "s/char[[:space:]]*\*[[:space:]]*argv\[\]/char **argv/g"

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

diff --git a/networking/ether-wake.c b/networking/ether-wake.c
index 7d5f79b6a4f81e995a2e8fe17e38858a3e43d6a8..e971ba39c5b91e4dace1eef1c9b43432cb0e5944 100644 (file)
--- a/networking/ether-wake.c
+++ b/networking/ether-wake.c
@@ -1,10 +1,8 @@
+/* vi: set sw=4 ts=4: */
 /*
  * ether-wake.c - Send a magic packet to wake up sleeping machines.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  *
  * Author:      Donald Becker, http://www.scyld.com/"; http://www.scyld.com/wakeonlan.html
  * Busybox port: Christian Volkmann <haveaniceday@online.de>
@@ -67,25 +65,10 @@
 */
 
 
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <ctype.h>
-#include <string.h>
-
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <features.h>
 #include <netpacket/packet.h>
 #include <net/ethernet.h>
-#include <netdb.h>
 #include <netinet/ether.h>
-
-#ifdef __linux__
 #include <linux/if.h>
-#endif
 
 #include "busybox.h"
 
@@ -95,10 +78,10 @@
  */
 #ifdef PF_PACKET
 # define whereto_t sockaddr_ll
-# define make_socket() socket(PF_PACKET, SOCK_RAW, 0)
+# define make_socket() xsocket(PF_PACKET, SOCK_RAW, 0)
 #else
 # define whereto_t sockaddr
-# define make_socket() socket(AF_INET, SOCK_PACKET, SOCK_PACKET)
+# define make_socket() xsocket(AF_INET, SOCK_PACKET, SOCK_PACKET)
 #endif
 
 #ifdef DEBUG
@@ -109,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");
 }
@@ -122,9 +105,11 @@ static inline void get_dest_addr(const char *arg, struct ether_addr *eaddr);
 static inline int get_fill(unsigned char *pkt, struct ether_addr *eaddr, int broadcast);
 static inline int get_wol_pw(const char *ethoptarg, unsigned char *wol_passwd);
 
-int etherwake_main(int argc, char *argv[])
+int ether_wake_main(int argc, char **argv);
+int ether_wake_main(int argc, char **argv)
 {
-       char *ifname = "eth0", *pass = NULL;
+       const char *ifname = "eth0";
+       char *pass = NULL;
        unsigned long flags;
        unsigned char wol_passwd[6];
        int wol_passwd_sz = 0;
@@ -137,7 +122,7 @@ int etherwake_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,11 +130,9 @@ int etherwake_main(int argc, char *argv[])
 
        /* create the raw socket */
        s = make_socket();
-       if (s < 0)
-               bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket);
 
        /* now that we have a raw socket we can drop root */
-       setuid(getuid());
+       xsetuid(getuid());
 
        /* look up the dest mac address */
        get_dest_addr(argv[optind], &eaddr);
@@ -164,7 +147,7 @@ int etherwake_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);
 
@@ -194,8 +177,7 @@ int etherwake_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");
        }
 
@@ -243,8 +225,6 @@ static inline void get_dest_addr(const char *hostid, struct ether_addr *eaddr)
 #if !defined(__UCLIBC__)
        } else if (ether_hostton(hostid, eaddr) == 0) {
                bb_debug_msg("Station address for hostname %s is %s\n\n", hostid, ether_ntoa(eaddr));
-#else
-# warning Need to implement ether_hostton() for uClibc
 #endif
        } else
                bb_show_usage();
@@ -289,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;
        }