diff options
| author | Ron Yorston <rmy@pobox.com> | 2022-01-06 07:46:38 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2022-01-06 07:46:38 +0000 |
| commit | b8751bbc9ac24e71fbe1e79c69074b4c87a134d8 (patch) | |
| tree | 336d653df8387b9b1d3c6e46caa373c00cb9b2b2 /networking/nc.c | |
| parent | b15f68214da209b5b293039c09c00f490c0cc193 (diff) | |
| parent | 6062c0d19bc201cbeb61b8875598cdd7a14a5ae0 (diff) | |
| download | busybox-w32-b8751bbc9ac24e71fbe1e79c69074b4c87a134d8.tar.gz busybox-w32-b8751bbc9ac24e71fbe1e79c69074b4c87a134d8.tar.bz2 busybox-w32-b8751bbc9ac24e71fbe1e79c69074b4c87a134d8.zip | |
Merge busybox into merge
Fix merge conflict in miscutils/less.c.
Use exit_SUCCESS() where possible.
Diffstat (limited to 'networking/nc.c')
| -rw-r--r-- | networking/nc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/networking/nc.c b/networking/nc.c index 5525e41f9..d039e2055 100644 --- a/networking/nc.c +++ b/networking/nc.c | |||
| @@ -287,7 +287,7 @@ int nc_main(int argc, char **argv) | |||
| 287 | nread = safe_read(pfds[fdidx].fd, iobuf, COMMON_BUFSIZE); | 287 | nread = safe_read(pfds[fdidx].fd, iobuf, COMMON_BUFSIZE); |
| 288 | if (fdidx != 0) { | 288 | if (fdidx != 0) { |
| 289 | if (nread < 1) | 289 | if (nread < 1) |
| 290 | exit(EXIT_SUCCESS); | 290 | exit_SUCCESS(); |
| 291 | ofd = STDOUT_FILENO; | 291 | ofd = STDOUT_FILENO; |
| 292 | } else { | 292 | } else { |
| 293 | if (nread < 1) { | 293 | if (nread < 1) { |
| @@ -324,7 +324,7 @@ int nc_main(int argc, char **argv) | |||
| 324 | nread = safe_read(fd, iobuf, COMMON_BUFSIZE); | 324 | nread = safe_read(fd, iobuf, COMMON_BUFSIZE); |
| 325 | if (fd == cfd) { | 325 | if (fd == cfd) { |
| 326 | if (nread < 1) | 326 | if (nread < 1) |
| 327 | exit(EXIT_SUCCESS); | 327 | exit_SUCCESS(); |
| 328 | ofd = STDOUT_FILENO; | 328 | ofd = STDOUT_FILENO; |
| 329 | } else { | 329 | } else { |
| 330 | if (nread < 1) { | 330 | if (nread < 1) { |