aboutsummaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
Diffstat (limited to 'networking')
-rw-r--r--networking/ether-wake.c2
-rw-r--r--networking/ipcalc.c2
-rw-r--r--networking/libiproute/ipaddress.c2
-rw-r--r--networking/libiproute/iproute.c4
-rw-r--r--networking/libiproute/iptunnel.c6
-rw-r--r--networking/libiproute/libnetlink.c2
-rw-r--r--networking/libiproute/ll_map.c2
-rw-r--r--networking/nameif.c4
-rw-r--r--networking/tc.c2
-rw-r--r--networking/tcpudp.c12
-rw-r--r--networking/udhcp/arpping.c2
-rw-r--r--networking/udhcp/dhcpd.c2
-rw-r--r--networking/udhcp/options.c2
-rw-r--r--networking/udhcp/signalpipe.c2
-rw-r--r--networking/wget.c2
15 files changed, 24 insertions, 24 deletions
diff --git a/networking/ether-wake.c b/networking/ether-wake.c
index 59f40535c..e05db7a80 100644
--- a/networking/ether-wake.c
+++ b/networking/ether-wake.c
@@ -167,7 +167,7 @@ static int get_wol_pw(const char *ethoptarg, unsigned char *wol_passwd)
167 byte_cnt = sscanf(ethoptarg, "%u.%u.%u.%u", 167 byte_cnt = sscanf(ethoptarg, "%u.%u.%u.%u",
168 &passwd[0], &passwd[1], &passwd[2], &passwd[3]); 168 &passwd[0], &passwd[1], &passwd[2], &passwd[3]);
169 if (byte_cnt < 4) { 169 if (byte_cnt < 4) {
170 bb_error_msg("cannot read Wake-On-LAN pass"); 170 bb_error_msg("can't read Wake-On-LAN pass");
171 return 0; 171 return 0;
172 } 172 }
173// TODO: check invalid numbers >255?? 173// TODO: check invalid numbers >255??
diff --git a/networking/ipcalc.c b/networking/ipcalc.c
index b5cc3dec4..18abc12eb 100644
--- a/networking/ipcalc.c
+++ b/networking/ipcalc.c
@@ -178,7 +178,7 @@ int ipcalc_main(int argc, char **argv)
178 178
179 hostinfo = gethostbyaddr((char *) &ipaddr, sizeof(ipaddr), AF_INET); 179 hostinfo = gethostbyaddr((char *) &ipaddr, sizeof(ipaddr), AF_INET);
180 if (!hostinfo) { 180 if (!hostinfo) {
181 bb_herror_msg_and_die("cannot find hostname for %s", argv[0]); 181 bb_herror_msg_and_die("can't find hostname for %s", argv[0]);
182 } 182 }
183 str_tolower(hostinfo->h_name); 183 str_tolower(hostinfo->h_name);
184 184
diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c
index fcf9623e4..c450c6a9f 100644
--- a/networking/libiproute/ipaddress.c
+++ b/networking/libiproute/ipaddress.c
@@ -426,7 +426,7 @@ int ipaddr_list_or_flush(char **argv, int flush)
426 bb_error_msg_and_die(bb_msg_requires_arg, "flush"); 426 bb_error_msg_and_die(bb_msg_requires_arg, "flush");
427 } 427 }
428 if (filter.family == AF_PACKET) { 428 if (filter.family == AF_PACKET) {
429 bb_error_msg_and_die("cannot flush link addresses"); 429 bb_error_msg_and_die("can't flush link addresses");
430 } 430 }
431 } 431 }
432 432
diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c
index 7031bed34..67eb90b84 100644
--- a/networking/libiproute/iproute.c
+++ b/networking/libiproute/iproute.c
@@ -499,7 +499,7 @@ static void iproute_flush_cache(void)
499 } 499 }
500 500
501 if (write(flush_fd, "-1", 2) < 2) { 501 if (write(flush_fd, "-1", 2) < 2) {
502 bb_perror_msg("cannot flush routing cache"); 502 bb_perror_msg("can't flush routing cache");
503 return; 503 return;
504 } 504 }
505 close(flush_fd); 505 close(flush_fd);
@@ -681,7 +681,7 @@ static int iproute_list_or_flush(char **argv, int flush)
681 if (filter.tb != -1) { 681 if (filter.tb != -1) {
682 xrtnl_wilddump_request(&rth, do_ipv6, RTM_GETROUTE); 682 xrtnl_wilddump_request(&rth, do_ipv6, RTM_GETROUTE);
683 } else if (rtnl_rtcache_request(&rth, do_ipv6) < 0) { 683 } else if (rtnl_rtcache_request(&rth, do_ipv6) < 0) {
684 bb_perror_msg_and_die("cannot send dump request"); 684 bb_perror_msg_and_die("can't send dump request");
685 } 685 }
686 xrtnl_dump_filter(&rth, print_route, NULL); 686 xrtnl_dump_filter(&rth, print_route, NULL);
687 687
diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c
index 836709c7e..67afd1bfd 100644
--- a/networking/libiproute/iptunnel.c
+++ b/networking/libiproute/iptunnel.c
@@ -222,7 +222,7 @@ static void parse_args(char **argv, int cmd, struct ip_tunnel_parm *p)
222 } 222 }
223 p->iph.protocol = IPPROTO_IPV6; 223 p->iph.protocol = IPPROTO_IPV6;
224 } else { 224 } else {
225 bb_error_msg_and_die("%s tunnel mode", "cannot guess"); 225 bb_error_msg_and_die("%s tunnel mode", "can't guess");
226 } 226 }
227 } else if (key == ARG_key) { 227 } else if (key == ARG_key) {
228 unsigned uval; 228 unsigned uval;
@@ -377,7 +377,7 @@ static int do_add(int cmd, char **argv)
377 case IPPROTO_IPV6: 377 case IPPROTO_IPV6:
378 return do_add_ioctl(cmd, "sit0", &p); 378 return do_add_ioctl(cmd, "sit0", &p);
379 default: 379 default:
380 bb_error_msg_and_die("cannot determine tunnel mode (ipip, gre or sit)"); 380 bb_error_msg_and_die("can't determine tunnel mode (ipip, gre or sit)");
381 } 381 }
382} 382}
383 383
@@ -499,7 +499,7 @@ static void do_tunnels_list(struct ip_tunnel_parm *p)
499 continue; 499 continue;
500 type = do_ioctl_get_iftype(name); 500 type = do_ioctl_get_iftype(name);
501 if (type == -1) { 501 if (type == -1) {
502 bb_error_msg("cannot get type of [%s]", name); 502 bb_error_msg("can't get type of [%s]", name);
503 continue; 503 continue;
504 } 504 }
505 if (type != ARPHRD_TUNNEL && type != ARPHRD_IPGRE && type != ARPHRD_SIT) 505 if (type != ARPHRD_TUNNEL && type != ARPHRD_IPGRE && type != ARPHRD_SIT)
diff --git a/networking/libiproute/libnetlink.c b/networking/libiproute/libnetlink.c
index b4cc8dfa4..9e6467de5 100644
--- a/networking/libiproute/libnetlink.c
+++ b/networking/libiproute/libnetlink.c
@@ -242,7 +242,7 @@ int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n,
242 status = sendmsg(rtnl->fd, &msg, 0); 242 status = sendmsg(rtnl->fd, &msg, 0);
243 243
244 if (status < 0) { 244 if (status < 0) {
245 bb_perror_msg("cannot talk to rtnetlink"); 245 bb_perror_msg("can't talk to rtnetlink");
246 goto ret; 246 goto ret;
247 } 247 }
248 248
diff --git a/networking/libiproute/ll_map.c b/networking/libiproute/ll_map.c
index 3c4ef2c32..246b9e33a 100644
--- a/networking/libiproute/ll_map.c
+++ b/networking/libiproute/ll_map.c
@@ -193,7 +193,7 @@ int FAST_FUNC xll_name_to_index(const char *name)
193 } 193 }
194/* out:*/ 194/* out:*/
195 if (ret <= 0) 195 if (ret <= 0)
196 bb_error_msg_and_die("cannot find device \"%s\"", name); 196 bb_error_msg_and_die("can't find device '%s'", name);
197 return ret; 197 return ret;
198} 198}
199 199
diff --git a/networking/nameif.c b/networking/nameif.c
index fb31fbfff..36fbb954e 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -92,7 +92,7 @@ static void nameif_parse_selector(ethtable_t *ch, char *selector)
92 lmac = xmalloc(ETH_ALEN); 92 lmac = xmalloc(ETH_ALEN);
93 ch->mac = ether_aton_r(selector + (strncmp(selector, "mac=", 4) ? 0 : 4), lmac); 93 ch->mac = ether_aton_r(selector + (strncmp(selector, "mac=", 4) ? 0 : 4), lmac);
94 if (ch->mac == NULL) 94 if (ch->mac == NULL)
95 bb_error_msg_and_die("cannot parse %s", selector); 95 bb_error_msg_and_die("can't parse %s", selector);
96#if ENABLE_FEATURE_NAMEIF_EXTENDED 96#if ENABLE_FEATURE_NAMEIF_EXTENDED
97 found_selector++; 97 found_selector++;
98 }; 98 };
@@ -211,7 +211,7 @@ int nameif_main(int argc, char **argv)
211 if (strcmp(ifr.ifr_name, ch->ifname) != 0) { 211 if (strcmp(ifr.ifr_name, ch->ifname) != 0) {
212 strcpy(ifr.ifr_newname, ch->ifname); 212 strcpy(ifr.ifr_newname, ch->ifname);
213 ioctl_or_perror_and_die(ctl_sk, SIOCSIFNAME, &ifr, 213 ioctl_or_perror_and_die(ctl_sk, SIOCSIFNAME, &ifr,
214 "cannot change ifname %s to %s", 214 "can't change ifname %s to %s",
215 ifr.ifr_name, ch->ifname); 215 ifr.ifr_name, ch->ifname);
216 } 216 }
217 /* Remove list entry of renamed interface */ 217 /* Remove list entry of renamed interface */
diff --git a/networking/tc.c b/networking/tc.c
index d9636949c..3115a5254 100644
--- a/networking/tc.c
+++ b/networking/tc.c
@@ -531,7 +531,7 @@ int tc_main(int argc UNUSED_PARAM, char **argv)
531 if (rtnl_dump_request(&rth, obj == OBJ_qdisc ? RTM_GETQDISC : 531 if (rtnl_dump_request(&rth, obj == OBJ_qdisc ? RTM_GETQDISC :
532 obj == OBJ_class ? RTM_GETTCLASS : RTM_GETTFILTER, 532 obj == OBJ_class ? RTM_GETTCLASS : RTM_GETTFILTER,
533 &msg, sizeof(msg)) < 0) 533 &msg, sizeof(msg)) < 0)
534 bb_simple_perror_msg_and_die("cannot send dump request"); 534 bb_simple_perror_msg_and_die("can't send dump request");
535 535
536 xrtnl_dump_filter(&rth, obj == OBJ_qdisc ? print_qdisc : 536 xrtnl_dump_filter(&rth, obj == OBJ_qdisc ? print_qdisc :
537 obj == OBJ_class ? print_class : print_filter, 537 obj == OBJ_class ? print_class : print_filter,
diff --git a/networking/tcpudp.c b/networking/tcpudp.c
index 98a2aa8c0..25b3319ec 100644
--- a/networking/tcpudp.c
+++ b/networking/tcpudp.c
@@ -251,14 +251,14 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv)
251 if (!cert) cert = "./cert.pem"; 251 if (!cert) cert = "./cert.pem";
252 if (!key) key = cert; 252 if (!key) key = cert;
253 if (matrixSslOpen() < 0) 253 if (matrixSslOpen() < 0)
254 fatal("cannot initialize ssl"); 254 fatal("can't initialize ssl");
255 if (matrixSslReadKeys(&keys, cert, key, 0, ca) < 0) { 255 if (matrixSslReadKeys(&keys, cert, key, 0, ca) < 0) {
256 if (client) 256 if (client)
257 fatal("cannot read cert, key, or ca file"); 257 fatal("can't read cert, key, or ca file");
258 fatal("cannot read cert or key file"); 258 fatal("can't read cert or key file");
259 } 259 }
260 if (matrixSslNewSession(&ssl, keys, 0, SSL_FLAGS_SERVER) < 0) 260 if (matrixSslNewSession(&ssl, keys, 0, SSL_FLAGS_SERVER) < 0)
261 fatal("cannot create ssl session"); 261 fatal("can't create ssl session");
262#endif 262#endif
263 263
264 sig_block(SIGCHLD); 264 sig_block(SIGCHLD);
@@ -425,7 +425,7 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv)
425 if (opts & OPT_h) { 425 if (opts & OPT_h) {
426 free_me1 = remote_hostname = xmalloc_sockaddr2host_noport(&remote.u.sa); 426 free_me1 = remote_hostname = xmalloc_sockaddr2host_noport(&remote.u.sa);
427 if (!remote_hostname) { 427 if (!remote_hostname) {
428 bb_error_msg("cannot look up hostname for %s", remote_addr); 428 bb_error_msg("can't look up hostname for %s", remote_addr);
429 remote_hostname = remote_addr; 429 remote_hostname = remote_addr;
430 } 430 }
431 } 431 }
@@ -441,7 +441,7 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv)
441 if (!local_hostname) { 441 if (!local_hostname) {
442 free_me2 = local_hostname = xmalloc_sockaddr2host_noport(&local.u.sa); 442 free_me2 = local_hostname = xmalloc_sockaddr2host_noport(&local.u.sa);
443 if (!local_hostname) 443 if (!local_hostname)
444 bb_error_msg_and_die("cannot look up hostname for %s", local_addr); 444 bb_error_msg_and_die("can't look up hostname for %s", local_addr);
445 } 445 }
446 /* else: local_hostname is not NULL, but is NOT malloced! */ 446 /* else: local_hostname is not NULL, but is NOT malloced! */
447 } 447 }
diff --git a/networking/udhcp/arpping.c b/networking/udhcp/arpping.c
index 48158fc43..3df0f39b7 100644
--- a/networking/udhcp/arpping.c
+++ b/networking/udhcp/arpping.c
@@ -57,7 +57,7 @@ int FAST_FUNC arpping(uint32_t test_nip,
57 } 57 }
58 58
59 if (setsockopt_broadcast(s) == -1) { 59 if (setsockopt_broadcast(s) == -1) {
60 bb_perror_msg("cannot enable bcast on raw socket"); 60 bb_perror_msg("can't enable bcast on raw socket");
61 goto ret; 61 goto ret;
62 } 62 }
63 63
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index 23292a55d..dc5d9ffe9 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -77,7 +77,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
77 77
78 /* Create pidfile */ 78 /* Create pidfile */
79 write_pidfile(server_config.pidfile); 79 write_pidfile(server_config.pidfile);
80 /* if (!..) bb_perror_msg("cannot create pidfile %s", pidfile); */ 80 /* if (!..) bb_perror_msg("can't create pidfile %s", pidfile); */
81 81
82 bb_info_msg("%s (v"BB_VER") started", applet_name); 82 bb_info_msg("%s (v"BB_VER") started", applet_name);
83 83
diff --git a/networking/udhcp/options.c b/networking/udhcp/options.c
index 38f99196e..10ec4597f 100644
--- a/networking/udhcp/options.c
+++ b/networking/udhcp/options.c
@@ -255,6 +255,6 @@ int FAST_FUNC add_simple_option(uint8_t *optionptr, uint8_t code, uint32_t data)
255 } 255 }
256 } 256 }
257 257
258 bb_error_msg("cannot add option 0x%02x", code); 258 bb_error_msg("can't add option 0x%02x", code);
259 return 0; 259 return 0;
260} 260}
diff --git a/networking/udhcp/signalpipe.c b/networking/udhcp/signalpipe.c
index a025bd8b5..c181e0e06 100644
--- a/networking/udhcp/signalpipe.c
+++ b/networking/udhcp/signalpipe.c
@@ -29,7 +29,7 @@ static void signal_handler(int sig)
29{ 29{
30 unsigned char ch = sig; /* use char, avoid dealing with partial writes */ 30 unsigned char ch = sig; /* use char, avoid dealing with partial writes */
31 if (write(signal_pipe.wr, &ch, 1) != 1) 31 if (write(signal_pipe.wr, &ch, 1) != 1)
32 bb_perror_msg("cannot send signal"); 32 bb_perror_msg("can't send signal");
33} 33}
34 34
35 35
diff --git a/networking/wget.c b/networking/wget.c
index 11d39cb66..8ca6def67 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -626,7 +626,7 @@ int wget_main(int argc UNUSED_PARAM, char **argv)
626 626
627 /* Impossible? 627 /* Impossible?
628 if ((opt & WGET_OPT_CONTINUE) && !fname_out) 628 if ((opt & WGET_OPT_CONTINUE) && !fname_out)
629 bb_error_msg_and_die("cannot specify continue (-c) without a filename (-O)"); 629 bb_error_msg_and_die("can't specify continue (-c) without a filename (-O)");
630 */ 630 */
631 631
632 /* Determine where to start transfer */ 632 /* Determine where to start transfer */