1 files changed, 30 insertions, 1 deletions

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! */