[git commit 1_14_stable] revert last commit, it was meant for master

Denys Vlasenko vda.linux at googlemail.com
Mon Aug 3 00:59:22 UTC 2009


commit: http://git.busybox.net/busybox/commit/?id=89f022469f42895aa12ee39aeb9c84bf45a58c4c
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/1_14_stable

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 networking/nc.c |   17 ++++++-----------
 1 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/networking/nc.c b/networking/nc.c
index 1babe3b..fe845f5 100644
--- a/networking/nc.c
+++ b/networking/nc.c
@@ -172,12 +172,11 @@ int nc_main(int argc, char **argv)
 
 		testfds = readfds;
 
-		if (select(cfd + 1, &testfds, NULL, NULL, NULL) < 0)
+		if (select(FD_SETSIZE, &testfds, NULL, NULL, NULL) < 0)
 			bb_perror_msg_and_die("select");
 
 #define iobuf bb_common_bufsiz1
-		fd = STDIN_FILENO;
-		while (1) {
+		for (fd = 0; fd < FD_SETSIZE; fd++) {
 			if (FD_ISSET(fd, &testfds)) {
 				nread = safe_read(fd, iobuf, sizeof(iobuf));
 				if (fd == cfd) {
@@ -185,21 +184,17 @@ int nc_main(int argc, char **argv)
 						exit(EXIT_SUCCESS);
 					ofd = STDOUT_FILENO;
 				} else {
-					if (nread < 1) {
-						/* Close outgoing half-connection so they get EOF,
-						 * but leave incoming alone so we can see response */
+					if (nread<1) {
+						// Close outgoing half-connection so they get EOF, but
+						// leave incoming alone so we can see response.
 						shutdown(cfd, 1);
 						FD_CLR(STDIN_FILENO, &readfds);
 					}
 					ofd = cfd;
 				}
 				xwrite(ofd, iobuf, nread);
-				if (delay > 0)
-					sleep(delay);
+				if (delay > 0) sleep(delay);
 			}
-			if (fd == cfd)
-				break;
-			fd = cfd;
 		}
 	}
 }
-- 
1.6.3.3



More information about the busybox-cvs mailing list