3 files changed, 29 insertions, 16 deletions

diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index d70f4ca77..cb0a96b59 100644
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -123,6 +123,9 @@ static int ftpcmd(const char *s1, const char *s2)
                 fprintf(control_stream, (s2 ? "%s %s\r\n" : "%s %s\r\n"+3),
                                                 s1, s2);
                 fflush(control_stream);
+#if ENABLE_PLATFORM_MINGW32
+                fseek(control_stream, 0L, SEEK_CUR);
+#endif
         }
 
         do {
@@ -131,6 +134,9 @@ static int ftpcmd(const char *s1, const char *s2)
                         ftp_die(NULL);
                 }
         } while (!isdigit(buf[0]) || buf[3] != ' ');
+#if ENABLE_PLATFORM_MINGW32
+        fseek(control_stream, 0L, SEEK_CUR);
+#endif
 
         buf[3] = '\0';
         n = xatou(buf);
diff --git a/networking/nc.c b/networking/nc.c
index a13d77a00..df073d7df 100644
--- a/networking/nc.c
+++ b/networking/nc.c
@@ -117,7 +117,7 @@ int nc_main(int argc, char **argv)
         IF_NOT_NC_EXTRA (const) unsigned delay = 0;
         IF_NOT_NC_EXTRA (const int execparam = 0;)
         IF_NC_EXTRA     (char **execparam = NULL;)
-        struct pollfd pfds[2];
+        fd_set readfds, testfds;
         int opt; /* must be signed (getopt returns -1) */
 
         if (ENABLE_NC_SERVER || ENABLE_NC_EXTRA) {
@@ -235,28 +235,29 @@ int nc_main(int argc, char **argv)
                 IF_NC_EXTRA(bb_perror_msg_and_die("can't execute '%s'", execparam[0]);)
         }
 
-        /* loop copying stdin to cfd, and cfd to stdout */
+        /* Select loop copying stdin to cfd, and cfd to stdout */
 
-        pfds[0].fd = STDIN_FILENO;
-        pfds[0].events = POLLIN;
-        pfds[1].fd = cfd;
-        pfds[1].events = POLLIN;
+        FD_ZERO(&readfds);
+        FD_SET(cfd, &readfds);
+        FD_SET(STDIN_FILENO, &readfds);
 
 #define iobuf bb_common_bufsiz1
         setup_common_bufsiz();
         for (;;) {
-                int fdidx;
+                int fd;
                 int ofd;
                 int nread;
 
-                if (safe_poll(pfds, 2, -1) < 0)
-                        bb_perror_msg_and_die("poll");
+                testfds = readfds;
 
-                fdidx = 0;
+                if (select(cfd + 1, &testfds, NULL, NULL, NULL) < 0)
+                        bb_perror_msg_and_die("select");
+
+                fd = STDIN_FILENO;
                 while (1) {
-                        if (pfds[fdidx].revents) {
-                                nread = safe_read(pfds[fdidx].fd, iobuf, COMMON_BUFSIZE);
-                                if (fdidx != 0) {
+                        if (FD_ISSET(fd, &testfds)) {
+                                nread = safe_read(fd, iobuf, COMMON_BUFSIZE);
+                                if (fd == cfd) {
                                         if (nread < 1)
                                                 exit(EXIT_SUCCESS);
                                         ofd = STDOUT_FILENO;
@@ -265,7 +266,7 @@ int nc_main(int argc, char **argv)
                                                 /* Close outgoing half-connection so they get EOF,
                                                  * but leave incoming alone so we can see response */
                                                 shutdown(cfd, SHUT_WR);
-                                                pfds[0].fd = -1;
+                                                FD_CLR(STDIN_FILENO, &readfds);
                                         }
                                         ofd = cfd;
                                 }
@@ -273,9 +274,9 @@ int nc_main(int argc, char **argv)
                                 if (delay > 0)
                                         sleep(delay);
                         }
-                        if (fdidx == 1)
+                        if (fd == cfd)
                                 break;
-                        fdidx++;
+                        fd = cfd;
                 }
         }
 }
diff --git a/networking/wget.c b/networking/wget.c
index e47c9a51b..ab9bc1836 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -457,11 +457,17 @@ static int ftpcmd(const char *s1, const char *s2, FILE *fp)
                         fprintf(stderr, "--> %s%s\n\n", s1, s2);
                 fflush(fp);
                 log_io("> %s%s", s1, s2);
+#if ENABLE_PLATFORM_MINGW32
+                fseek(fp, 0L, SEEK_CUR);
+#endif
         }
 
         do {
                 fgets_and_trim(fp, "%s\n");
         } while (!isdigit(G.wget_buf[0]) || G.wget_buf[3] != ' ');
+#if ENABLE_PLATFORM_MINGW32
+        fseek(fp, 0L, SEEK_CUR);
+#endif
 
         G.wget_buf[3] = '\0';
         result = xatoi_positive(G.wget_buf);