diff options
author | Ron Yorston <rmy@pobox.com> | 2019-08-16 09:42:39 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2019-08-16 09:45:21 +0100 |
commit | 517cf74f6265ec4308b790b637b3f9778cbdc6e0 (patch) | |
tree | be9337069b60ca1bb03565d8575bacfc71181003 /networking/nc.c | |
parent | ae65dc37bcc9b1d9cef0b111131c79dc4ba1bf51 (diff) | |
parent | ac78f2ac96b3efd6551a08e7dc609efa1fb69481 (diff) | |
download | busybox-w32-517cf74f6265ec4308b790b637b3f9778cbdc6e0.tar.gz busybox-w32-517cf74f6265ec4308b790b637b3f9778cbdc6e0.tar.bz2 busybox-w32-517cf74f6265ec4308b790b637b3f9778cbdc6e0.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'networking/nc.c')
-rw-r--r-- | networking/nc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/networking/nc.c b/networking/nc.c index 3e122b787..3dce6a528 100644 --- a/networking/nc.c +++ b/networking/nc.c | |||
@@ -113,7 +113,7 @@ | |||
113 | #if ENABLE_NC_EXTRA | 113 | #if ENABLE_NC_EXTRA |
114 | static void timeout(int signum UNUSED_PARAM) | 114 | static void timeout(int signum UNUSED_PARAM) |
115 | { | 115 | { |
116 | bb_error_msg_and_die("timed out"); | 116 | bb_simple_error_msg_and_die("timed out"); |
117 | } | 117 | } |
118 | #endif | 118 | #endif |
119 | 119 | ||
@@ -215,7 +215,7 @@ int nc_main(int argc, char **argv) | |||
215 | IF_NC_EXTRA(accept_again:) | 215 | IF_NC_EXTRA(accept_again:) |
216 | cfd = accept(sfd, NULL, 0); | 216 | cfd = accept(sfd, NULL, 0); |
217 | if (cfd < 0) | 217 | if (cfd < 0) |
218 | bb_perror_msg_and_die("accept"); | 218 | bb_simple_perror_msg_and_die("accept"); |
219 | if (!execparam) | 219 | if (!execparam) |
220 | close(sfd); | 220 | close(sfd); |
221 | } else { | 221 | } else { |
@@ -267,7 +267,7 @@ int nc_main(int argc, char **argv) | |||
267 | testfds = readfds; | 267 | testfds = readfds; |
268 | 268 | ||
269 | if (select(cfd + 1, &testfds, NULL, NULL, NULL) < 0) | 269 | if (select(cfd + 1, &testfds, NULL, NULL, NULL) < 0) |
270 | bb_perror_msg_and_die("select"); | 270 | bb_simple_perror_msg_and_die("select"); |
271 | 271 | ||
272 | fd = STDIN_FILENO; | 272 | fd = STDIN_FILENO; |
273 | while (1) { | 273 | while (1) { |