1 files changed, 26 insertions, 2 deletions

diff --git a/archival/tar.c b/archival/tar.c
index d6ca6c1e0..23ea02b5d 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -119,6 +119,9 @@
 #include "libbb.h"
 #include "common_bufsiz.h"
 #include "bb_archive.h"
+#if ENABLE_PLATFORM_MINGW32
+# include "BB_VER.h"
+#endif
 /* FIXME: Stop using this non-standard feature */
 #ifndef FNM_LEADING_DIR
 # define FNM_LEADING_DIR 0
@@ -161,11 +164,13 @@ typedef struct TarBallInfo {
 # endif
         HardLinkInfo *hlInfoHead;       /* Hard Link Tracking Information */
         HardLinkInfo *hlInfo;           /* Hard Link Info for the current file */
+#if ENABLE_PLATFORM_POSIX || ENABLE_FEATURE_EXTRA_FILE_DATA
 //TODO: save only st_dev + st_ino
         struct stat tarFileStatBuf;     /* Stat info for the tarball, letting
                                          * us know the inode and device that the
                                          * tarball lives, so we can avoid trying
                                          * to include the tarball into itself */
+#endif
 } TarBallInfo;
 
 /* A nice enum with all the possible tar file content types */
@@ -506,15 +511,21 @@ static int FAST_FUNC writeFileToTarball(struct recursive_state *state,
                 }
         }
 
+#if ENABLE_PLATFORM_POSIX || ENABLE_FEATURE_EXTRA_FILE_DATA
         /* 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 */
         if (tbInfo->tarFileStatBuf.st_dev == statbuf->st_dev
          && tbInfo->tarFileStatBuf.st_ino == statbuf->st_ino
+# if ENABLE_FEATURE_EXTRA_FILE_DATA
+         /* ignore invalid inode numbers */
+         && statbuf->st_ino != 0
+# endif
         ) {
                 bb_error_msg("%s: file is the archive; skipping", fileName);
                 return TRUE;
         }
+#endif
 
 # if !ENABLE_FEATURE_TAR_GNU_EXTENSIONS
         if (strlen(header_name) >= NAME_SIZE) {
@@ -568,7 +579,7 @@ static int FAST_FUNC writeFileToTarball(struct recursive_state *state,
         return TRUE;
 }
 
-# if SEAMLESS_COMPRESSION
+# if SEAMLESS_COMPRESSION && !ENABLE_PLATFORM_MINGW32
 /* Don't inline: vfork scares gcc and pessimizes code */
 static void NOINLINE vfork_compressor(int tar_fd, const char *gzip)
 {
@@ -645,6 +656,10 @@ static void NOINLINE vfork_compressor(int tar_fd, const char *gzip)
 }
 # endif /* SEAMLESS_COMPRESSION */
 
+# if ENABLE_PLATFORM_MINGW32
+#  define vfork_compressor(f, g) mingw_fork_compressor((f), (g), "w")
+# endif
+
 
 # if !SEAMLESS_COMPRESSION
 /* Do not pass gzip flag to writeTarFile() */
@@ -659,16 +674,21 @@ static NOINLINE int writeTarFile(
         const char *gzip)
 {
         int errorFlag = FALSE;
+# if SEAMLESS_COMPRESSION && ENABLE_PLATFORM_MINGW32
+        pid_t pid = 0;
+# endif
 
         /*tbInfo->hlInfoHead = NULL; - already is */
 
+# if ENABLE_PLATFORM_POSIX || ENABLE_FEATURE_EXTRA_FILE_DATA
         /* Store the stat info for the tarball's file, so
          * can avoid including the tarball into itself....  */
         xfstat(tbInfo->tarFd, &tbInfo->tarFileStatBuf, "can't stat tar file");
+# endif
 
 # if SEAMLESS_COMPRESSION
         if (gzip)
-                vfork_compressor(tbInfo->tarFd, gzip);
+                IF_PLATFORM_MINGW32(pid = )vfork_compressor(tbInfo->tarFd, gzip);
 # endif
 
         /* Read the directory/files and iterate over them one at a time */
@@ -702,7 +722,11 @@ static NOINLINE int writeTarFile(
 # 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_simple_perror_msg("waitpid");
                 else if (!WIFEXITED(status) || WEXITSTATUS(status))
                         /* gzip was killed or has exited with nonzero! */