Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/networking/ether-wake.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/networking/ether-wake.c (modified) (8 diffs)

branches/2.2.9/mindi-busybox/networking/ether-wake.c

@@ -3 +3 @@
  * 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
@@ -93 +93 @@
     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");
@@ -112 +112 @@
     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();
+    }
 }
 
@@ -165 +168 @@
                           &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;
     }
@@ -179 +182 @@
 }
 
-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";
@@ -187 +190 @@
     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 */
@@ -220 +223 @@
         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);
 
@@ -256 +259 @@
     {
         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));