X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fether-wake.c;h=deeb68c096aeaebb1456afe6af9b1fde7fdf37fb;hb=765b0eed3ef29a80115708c3249d3a541509cd24;hp=59f40535ce9ec9bef06fc44cd31a20f66b965ac0;hpb=22cbfbd9964321ace99d1a6a31ee1ba685202c55;p=oweals%2Fbusybox.git diff --git a/networking/ether-wake.c b/networking/ether-wake.c index 59f40535c..deeb68c09 100644 --- a/networking/ether-wake.c +++ b/networking/ether-wake.c @@ -111,10 +111,9 @@ 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)); + bb_debug_msg("The target station address is %s\n\n", ether_ntoa(eap)); #if !defined(__UCLIBC_MAJOR__) \ || __UCLIBC_MAJOR__ > 0 \ || __UCLIBC_MINOR__ > 9 \ @@ -122,8 +121,9 @@ static void get_dest_addr(const char *hostid, struct ether_addr *eaddr) } 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) @@ -167,7 +167,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??