6 files changed, 82 insertions, 2 deletions

diff --git a/archival/ar.c b/archival/ar.c
index e49d5cb2b..a850868f6 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -165,6 +165,7 @@ static int write_ar_archive(archive_handle_t *handle)
 {
         struct stat st;
         archive_handle_t *out_handle;
+        char *temp_fn = NULL;
 
         xfstat(handle->src_fd, &st, handle->ar__name);
 
@@ -173,8 +174,14 @@ static int write_ar_archive(archive_handle_t *handle)
          */
         if (st.st_size != 0) {
                 out_handle = init_handle();
+#if !ENABLE_PLATFORM_MINGW32
                 xunlink(handle->ar__name);
                 out_handle->src_fd = xopen(handle->ar__name, O_WRONLY | O_CREAT | O_TRUNC);
+#else
+                /* can't unlink open file, create temporary output file */
+                temp_fn = xasprintf("%sXXXXXX", handle->ar__name);
+                out_handle->src_fd = xmkstemp(temp_fn);
+#endif
                 out_handle->accept = handle->accept;
         } else {
                 out_handle = handle;
@@ -196,12 +203,19 @@ static int write_ar_archive(archive_handle_t *handle)
                 continue;
 
         /* optional, since we exit right after we return */
-        if (ENABLE_FEATURE_CLEAN_UP) {
+        if (ENABLE_FEATURE_CLEAN_UP || ENABLE_PLATFORM_MINGW32) {
                 close(handle->src_fd);
                 if (out_handle->src_fd != handle->src_fd)
                         close(out_handle->src_fd);
         }
 
+#if ENABLE_PLATFORM_MINGW32
+        if ( temp_fn != NULL ) {
+                xrename(temp_fn, handle->ar__name);
+                free(temp_fn);
+        }
+#endif
+
         return EXIT_SUCCESS;
 }
 #endif /* FEATURE_AR_CREATE */
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 60a837e22..343aec9bd 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -183,6 +183,8 @@ int FAST_FUNC bbunpack(char **argv,
                                 /* Delete _source_ file */
                                 del = filename;
                         }
+                        if (ENABLE_PLATFORM_MINGW32)
+                                xclose(STDIN_FILENO);
                         xunlink(del);
  free_name:
                         if (new_name != filename)
diff --git a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c
index c7fa5b526..74d364379 100644
--- a/archival/libarchive/decompress_gunzip.c
+++ b/archival/libarchive/decompress_gunzip.c
@@ -1118,6 +1118,9 @@ static uint32_t buffer_read_le_u32(STATE_PARAM_ONLY)
         return res;
 }
 
+#if ENABLE_PLATFORM_MINGW32 && __GNUC__
+#pragma pack(2)
+#endif
 static int check_header_gzip(STATE_PARAM transformer_state_t *xstate)
 {
         union {
@@ -1189,6 +1192,9 @@ static int check_header_gzip(STATE_PARAM transformer_state_t *xstate)
         }
         return 1;
 }
+#if ENABLE_PLATFORM_MINGW32 && __GNUC__
+#pragma pack()
+#endif
 
 IF_DESKTOP(long long) int FAST_FUNC
 unpack_gz_stream(transformer_state_t *xstate)
diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c
index ac7e5db95..641256787 100644
--- a/archival/libarchive/open_transformer.c
+++ b/archival/libarchive/open_transformer.c
@@ -65,6 +65,7 @@ ssize_t FAST_FUNC xtransformer_write(transformer_state_t *xstate, const void *bu
         return nwrote;
 }
 
+#if !ENABLE_PLATFORM_MINGW32
 void check_errors_in_children(int signo)
 {
         int status;
@@ -151,6 +152,31 @@ 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 /* ENABLE_PLATFORM_MINGW */
+void check_errors_in_children(int signo UNUSED_PARAM)
+{
+        bb_got_signal = 0;
+}
+
+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 --busybox %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
 
 
 #if SEAMLESS_COMPRESSION
diff --git a/archival/tar.c b/archival/tar.c
index 8e315c610..c87d23597 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -554,6 +554,7 @@ static int FAST_FUNC writeFileToTarball(const char *fileName, struct stat *statb
                 }
         }
 
+#if !ENABLE_PLATFORM_MINGW32
         /* It is a bad idea to store the archive we are in the process of creating,
          * so check the device and inode to be sure that this particular file isn't
          * the new tarball */
@@ -563,6 +564,7 @@ static int FAST_FUNC writeFileToTarball(const char *fileName, struct stat *statb
                 bb_error_msg("%s: file is the archive; skipping", fileName);
                 return TRUE;
         }
+#endif
 
         if (exclude_file(tbInfo->excludeList, header_name))
                 return SKIP;
@@ -620,6 +622,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)
 {
@@ -679,6 +682,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 --busybox %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 */
 
 
@@ -694,6 +718,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;
@@ -705,7 +730,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;
@@ -741,7 +766,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! */
diff --git a/archival/unzip.c b/archival/unzip.c
index c540485ac..27adb3420 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -44,6 +44,9 @@
 
 #include "libbb.h"
 #include "bb_archive.h"
+#if ENABLE_PLATFORM_MINGW32 && __GNUC__
+#pragma pack(2)
+#endif
 
 #if 0
 # define dbg(...) bb_error_msg(__VA_ARGS__)