5 files changed, 60 insertions, 2 deletions

diff --git a/archival/cpio.c b/archival/cpio.c
index 454648d68..3cb7fdb35 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -374,6 +374,10 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
         argv += optind;
         if (opt & OPT_FILE) { /* -F */
                 xmove_fd(xopen(cpio_filename, O_RDONLY), STDIN_FILENO);
+#if ENABLE_PLATFORM_MINGW32
+                /* default is seek_by_read but seek_by_jump is OK for file */
+                archive_handle->seek = seek_by_jump;
+#endif
         }
 #else
         opt = getopt32(argv, OPTION_STR "oH:" IF_FEATURE_CPIO_P("p"), &cpio_filename, &cpio_fmt);
diff --git a/archival/libarchive/init_handle.c b/archival/libarchive/init_handle.c
index cbae06ac3..b1166d577 100644
--- a/archival/libarchive/init_handle.c
+++ b/archival/libarchive/init_handle.c
@@ -16,7 +16,12 @@ archive_handle_t* FAST_FUNC init_handle(void)
         archive_handle->action_header = header_skip;
         archive_handle->action_data = data_skip;
         archive_handle->filter = filter_accept_all;
+#if !ENABLE_PLATFORM_MINGW32
         archive_handle->seek = seek_by_jump;
+#else
+        /* can't reliably detect pipes on WIN32: default to seek_by_read */
+        archive_handle->seek = seek_by_read;
+#endif
 
         return archive_handle;
 }
diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c
index 1c5c185d0..24524f6ee 100644
--- a/archival/libarchive/open_transformer.c
+++ b/archival/libarchive/open_transformer.c
@@ -69,6 +69,7 @@ ssize_t FAST_FUNC xtransformer_write(transformer_state_t *xstate, const void *bu
 }
 
 #if SEAMLESS_COMPRESSION
+#if !ENABLE_PLATFORM_MINGW32
 void check_errors_in_children(int signo)
 {
         int status;
@@ -155,6 +156,25 @@ void FAST_FUNC fork_transformer(int fd, const char *transform_prog)
         close(fd_pipe.wr); /* don't want to write to the child */
         xmove_fd(fd_pipe.rd, fd);
 }
+#else
+void FAST_FUNC fork_transformer(int fd, const char *transform_prog)
+{
+        char *cmd;
+        int fd1;
+
+        if (find_applet_by_name(transform_prog) >= 0) {
+                cmd = xasprintf("%s %s -cf -", bb_busybox_exec_path, transform_prog);
+        }
+        else {
+                cmd = xasprintf("%s -cf -", transform_prog);
+        }
+        if ( (fd1=mingw_popen_fd(cmd, "r", fd, NULL)) == -1 ) {
+                bb_perror_msg_and_die("can't execute '%s'", transform_prog);
+        }
+        free(cmd);
+        xmove_fd(fd1, fd);
+}
+#endif
 
 /* Used by e.g. rpm which gives us a fd without filename,
  * thus we can't guess the format from filename's extension.
diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index 7057570f5..7703629cb 100644
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -88,7 +88,7 @@ int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
                 close(rpm_fd);
         }
 
-        if (SEAMLESS_COMPRESSION) {
+        if (SEAMLESS_COMPRESSION && !ENABLE_PLATFORM_MINGW32) {
                 check_errors_in_children(0);
                 return bb_got_signal;
         }
diff --git a/archival/tar.c b/archival/tar.c
index 85551684b..1f9dd23d2 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -617,6 +617,7 @@ static int FAST_FUNC writeFileToTarball(const char *fileName, struct stat *statb
 }
 
 #if SEAMLESS_COMPRESSION
+#if !ENABLE_PLATFORM_MINGW32
 /* Don't inline: vfork scares gcc and pessimizes code */
 static void NOINLINE vfork_compressor(int tar_fd, const char *gzip)
 {
@@ -676,6 +677,27 @@ static void NOINLINE vfork_compressor(int tar_fd, const char *gzip)
                 bb_perror_msg_and_die("can't execute '%s'", gzip);
         }
 }
+#else
+static pid_t vfork_compressor(int tar_fd, const char *gzip)
+{
+        char *cmd;
+        int fd1;
+        pid_t pid;
+
+        if (find_applet_by_name(gzip) >= 0) {
+                cmd = xasprintf("%s %s -cf -", bb_busybox_exec_path, gzip);
+        }
+        else {
+                cmd = xasprintf("%s -cf -", gzip);
+        }
+        if ( (fd1=mingw_popen_fd(cmd, "w", tar_fd, &pid)) == -1 ) {
+                bb_perror_msg_and_die("can't execute '%s'", gzip);
+        }
+        free(cmd);
+        xmove_fd(fd1, tar_fd);
+        return pid;
+}
+#endif /* ENABLE_PLATFORM_MINGW32 */
 #endif /* SEAMLESS_COMPRESSION */
 
 
@@ -691,6 +713,7 @@ static NOINLINE int writeTarFile(int tar_fd, int verboseFlag,
 {
         int errorFlag = FALSE;
         struct TarBallInfo tbInfo;
+        IF_PLATFORM_MINGW32(pid_t pid = 0;)
 
         tbInfo.hlInfoHead = NULL;
         tbInfo.tarFd = tar_fd;
@@ -702,7 +725,7 @@ static NOINLINE int writeTarFile(int tar_fd, int verboseFlag,
 
 #if SEAMLESS_COMPRESSION
         if (gzip)
-                vfork_compressor(tbInfo.tarFd, gzip);
+                IF_PLATFORM_MINGW32(pid = )vfork_compressor(tbInfo.tarFd, gzip);
 #endif
 
         tbInfo.excludeList = exclude;
@@ -738,7 +761,11 @@ static NOINLINE int writeTarFile(int tar_fd, int verboseFlag,
 #if SEAMLESS_COMPRESSION
         if (gzip) {
                 int status;
+#if !ENABLE_PLATFORM_MINGW32
                 if (safe_waitpid(-1, &status, 0) == -1)
+#else
+                if (safe_waitpid(pid, &status, 0) == -1)
+#endif
                         bb_perror_msg("waitpid");
                 else if (!WIFEXITED(status) || WEXITSTATUS(status))
                         /* gzip was killed or has exited with nonzero! */
@@ -1208,10 +1235,12 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
         if (ENABLE_FEATURE_CLEAN_UP /* && tar_handle->src_fd != STDIN_FILENO */)
                 close(tar_handle->src_fd);
 
+#if !ENABLE_PLATFORM_MINGW32
         if (SEAMLESS_COMPRESSION || OPT_COMPRESS) {
                 /* Set bb_got_signal to 1 if a child died with !0 exitcode */
                 check_errors_in_children(0);
         }
+#endif
 
         return bb_got_signal;
 }