5 files changed, 89 insertions, 17 deletions

diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index cb6910fb0..bff90538f 100644
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -106,6 +106,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 {
@@ -114,6 +117,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 b208f46c6..3e122b787 100644
--- a/networking/nc.c
+++ b/networking/nc.c
@@ -110,10 +110,12 @@
  * when compared to "standard" nc
  */
 
+#if ENABLE_NC_EXTRA
 static void timeout(int signum UNUSED_PARAM)
 {
         bb_error_msg_and_die("timed out");
 }
+#endif
 
 int nc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int nc_main(int argc, char **argv)
@@ -127,7 +129,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) {
@@ -187,10 +189,12 @@ int nc_main(int argc, char **argv)
                 argv++;
         }
 
+#if ENABLE_NC_EXTRA
         if (wsecs) {
                 signal(SIGALRM, timeout);
                 alarm(wsecs);
         }
+#endif
 
         if (!cfd) {
                 if (do_listen) {
@@ -208,7 +212,7 @@ int nc_main(int argc, char **argv)
                         }
 #endif
                         close_on_exec_on(sfd);
- accept_again:
+ IF_NC_EXTRA(accept_again:)
                         cfd = accept(sfd, NULL, 0);
                         if (cfd < 0)
                                 bb_perror_msg_and_die("accept");
@@ -226,6 +230,7 @@ int nc_main(int argc, char **argv)
                 /*signal(SIGALRM, SIG_DFL);*/
         }
 
+#if ENABLE_NC_EXTRA
         /* -e given? */
         if (execparam) {
                 pid_t pid;
@@ -244,29 +249,31 @@ int nc_main(int argc, char **argv)
                 IF_NC_EXTRA(BB_EXECVP(execparam[0], execparam);)
                 IF_NC_EXTRA(bb_perror_msg_and_die("can't execute '%s'", execparam[0]);)
         }
+#endif
 
-        /* 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;
+
+                if (select(cfd + 1, &testfds, NULL, NULL, NULL) < 0)
+                        bb_perror_msg_and_die("select");
 
-                fdidx = 0;
+                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;
@@ -275,7 +282,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;
                                 }
@@ -283,9 +290,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/ssl_client.c b/networking/ssl_client.c
index 397aad297..cd0ee5722 100644
--- a/networking/ssl_client.c
+++ b/networking/ssl_client.c
@@ -15,7 +15,12 @@
 //kbuild:lib-$(CONFIG_SSL_CLIENT) += ssl_client.o
 
 //usage:#define ssl_client_trivial_usage
+//usage:    IF_NOT_PLATFORM_MINGW32(
 //usage:       "[-e] -s FD [-r FD] [-n SNI]"
+//usage:    )
+//usage:    IF_PLATFORM_MINGW32(
+//usage:       "[-e] -h handle [-n SNI]"
+//usage:    )
 //usage:#define ssl_client_full_usage ""
 
 #include "libbb.h"
@@ -26,15 +31,23 @@ int ssl_client_main(int argc UNUSED_PARAM, char **argv)
         tls_state_t *tls;
         const char *sni = NULL;
         int opt;
+#if ENABLE_PLATFORM_MINGW32
+        char *hstr = NULL;
+        HANDLE h;
+#endif
 
         // INIT_G();
 
         tls = new_tls_state();
+#if !ENABLE_PLATFORM_MINGW32
         opt = getopt32(argv, "es:+r:+n:", &tls->ofd, &tls->ifd, &sni);
         if (!(opt & (1<<2))) {
                 /* -r N defaults to -s N */
                 tls->ifd = tls->ofd;
         }
+#else
+        opt = getopt32(argv, "eh:n:", &hstr, &sni);
+#endif
 
         if (!(opt & (3<<1))) {
                 if (!argv[1])
@@ -47,6 +60,13 @@ int ssl_client_main(int argc UNUSED_PARAM, char **argv)
                         sni = argv[1];
                 tls->ifd = tls->ofd = create_and_connect_stream_or_die(argv[1], 443);
         }
+#if ENABLE_PLATFORM_MINGW32
+        else {
+                if (!hstr || sscanf(hstr, "%p", &h) != 1)
+                        bb_error_msg_and_die("invalid handle");
+                tls->ifd = tls->ofd = _open_osfhandle((intptr_t)h, _O_RDWR|_O_BINARY);
+        }
+#endif
 
         tls_handshake(tls, sni);
 
diff --git a/networking/tls.c b/networking/tls.c
index db7be07f3..d1a0204ed 100644
--- a/networking/tls.c
+++ b/networking/tls.c
@@ -351,8 +351,14 @@ static void dump_tls_record(const void *vp, int len)
 
 void FAST_FUNC tls_get_random(void *buf, unsigned len)
 {
+#if !ENABLE_PLATFORM_MINGW32
         if (len != open_read_close("/dev/urandom", buf, len))
                 xfunc_die();
+#else
+        int fd = mingw_open("/dev/urandom", O_RDONLY|O_SPECIAL);
+        if (fd < 0 || len != read_close(fd, buf, len))
+                xfunc_die();
+#endif
 }
 
 static void xorbuf3(void *dst, const void *src1, const void *src2, unsigned count)
diff --git a/networking/wget.c b/networking/wget.c
index b6f9d605a..44cec2cb5 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -486,6 +486,9 @@ 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
         }
 
         /* Read until "Nxx something" is received */
@@ -493,6 +496,9 @@ static int ftpcmd(const char *s1, const char *s2, FILE *fp)
         do {
                 fgets_trim_sanitize(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);
@@ -716,6 +722,7 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
 #endif
 
 #if ENABLE_FEATURE_WGET_HTTPS
+# if !ENABLE_PLATFORM_MINGW32
 static void spawn_ssl_client(const char *host, int network_fd, int flags)
 {
         int sp[2];
@@ -770,6 +777,32 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
         close(sp[1]);
         xmove_fd(sp[0], network_fd);
 }
+# else
+static void spawn_ssl_client(const char *host, int network_fd, int flags)
+{
+        int fd1;
+        char *servername, *p, *cmd;
+
+        servername = xstrdup(host);
+        p = strrchr(servername, ':');
+        if (p) *p = '\0';
+
+        fflush_all();
+
+        cmd = xasprintf("%s --busybox ssl_client -h %p -n %s%s",
+                                        bb_busybox_exec_path,
+                                        (void *)_get_osfhandle(network_fd), servername,
+                                        flags & TLSLOOP_EXIT_ON_LOCAL_EOF ? " -e" : "");
+
+        if ( (fd1=mingw_popen_fd(cmd, "b", -1, NULL)) == -1 ) {
+                bb_perror_msg_and_die("can't execute ssl_client");
+        }
+
+        free(cmd);
+        free(servername);
+        xmove_fd(fd1, network_fd);
+}
+# endif
 #endif
 
 static FILE* prepare_ftp_session(FILE **dfpp, struct host_info *target, len_and_sockaddr *lsa)