9 files changed, 143 insertions, 7 deletions

diff --git a/archival/ar.c b/archival/ar.c
index f4edeb087..66930f0b8 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -163,6 +163,9 @@ static int write_ar_archive(archive_handle_t *handle)
 {
         struct stat st;
         archive_handle_t *out_handle;
+#if ENABLE_PLATFORM_MINGW32
+        char *temp_fn = NULL;
+#endif
 
         xfstat(handle->src_fd, &st, handle->ar__name);
 
@@ -171,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;
@@ -194,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 93f30d324..bf99656e2 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -178,6 +178,8 @@ int FAST_FUNC bbunpack(char **argv,
                                 if (option_mask32 & BBUNPK_OPT_KEEP) /* ... unless -k */
                                         del = NULL;
                         }
+                        if (ENABLE_PLATFORM_MINGW32)
+                                xclose(STDIN_FILENO);
                         if (del)
                                 xunlink(del);
  free_name:
diff --git a/archival/dpkg.c b/archival/dpkg.c
index ddb5daf09..08f15ad44 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -149,6 +149,11 @@ enum edge_type_e {
         EDGE_RECOMMENDS = 13,
         EDGE_ENHANCES = 15
 };
+#if ENABLE_PLATFORM_MINGW32
+#undef VER_EQUAL
+#undef VER_LESS
+#undef VER_LESS_EQUAL
+#endif
 enum operator_e {
         VER_NULL = 0,
         VER_EQUAL = 1,
@@ -1747,6 +1752,10 @@ int dpkg_main(int argc UNUSED_PARAM, char **argv)
         int state_status;
         int status_num;
         int i;
+#if ENABLE_PLATFORM_MINGW32
+        char **ptr, *path;
+        int fd;
+#endif
 #if ENABLE_LONG_OPTS
         static const char dpkg_longopts[] ALIGN1 =
 // FIXME: we use -C non-compatibly, should be:
@@ -1791,6 +1800,26 @@ int dpkg_main(int argc UNUSED_PARAM, char **argv)
                 bb_show_usage();
         }
 
+#if ENABLE_PLATFORM_MINGW32
+        if (opt & OPT_install) {
+                /* add system drive prefix to filenames, if necessary */
+                for (ptr = argv; *ptr; ++ptr) {
+                        *ptr = xabsolute_path(*ptr);
+                }
+        }
+
+        chdir_system_drive();
+
+        /* initialise data store */
+        path = xstrdup("/var/lib/dpkg/info");
+        bb_make_directory(path, -1, FILEUTILS_RECUR);
+        free(path);
+
+        fd = open("/var/lib/dpkg/status", O_RDWR|O_CREAT, 0666);
+        if (fd >= 0)
+                xclose(fd);
+#endif
+
 /*      puts("(Reading database ... xxxxx files and directories installed.)"); */
         index_status_file("/var/lib/dpkg/status");
 
diff --git a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c
index 7f9046b82..32fcb6b51 100644
--- a/archival/libarchive/decompress_gunzip.c
+++ b/archival/libarchive/decompress_gunzip.c
@@ -1123,6 +1123,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 {
@@ -1194,6 +1197,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 a90f42a45..3a0fc4712 100644
--- a/archival/libarchive/open_transformer.c
+++ b/archival/libarchive/open_transformer.c
@@ -64,6 +64,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;
@@ -150,6 +151,26 @@ 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 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/libarchive/unsafe_symlink_target.c b/archival/libarchive/unsafe_symlink_target.c
index f8dc8033d..ff96991f5 100644
--- a/archival/libarchive/unsafe_symlink_target.c
+++ b/archival/libarchive/unsafe_symlink_target.c
@@ -10,6 +10,7 @@ void FAST_FUNC create_or_remember_link(llist_t **link_placeholders,
                 const char *linkname,
                 int hard_link)
 {
+#if !ENABLE_PLATFORM_MINGW32
         if (hard_link || target[0] == '/' || strstr(target, "..")) {
                 llist_add_to_end(link_placeholders,
                         xasprintf("%c%s%c%s", hard_link, linkname, '\0', target)
@@ -22,8 +23,13 @@ void FAST_FUNC create_or_remember_link(llist_t **link_placeholders,
                         "sym", linkname, target
                 );
         }
+#else
+        /* symlink isn't implemented for WIN32, just issue a warning */
+        bb_perror_msg("can't create %slink '%s' to '%s'", "sym", linkname, target);
+#endif
 }
 
+#if !ENABLE_PLATFORM_MINGW32
 void FAST_FUNC create_links_from_list(llist_t *list)
 {
         while (list) {
@@ -40,3 +46,4 @@ void FAST_FUNC create_links_from_list(llist_t *list)
                 list = list->link;
         }
 }
+#endif
diff --git a/archival/rpm.c b/archival/rpm.c
index 95b2531e8..c9e8785e2 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -140,6 +140,7 @@ static int rpm_gettags(const char *filename)
         }
         G.mytags = tags;
 
+#if !ENABLE_PLATFORM_MINGW32
         /* Map the store */
         storepos = (storepos + G.pagesize) & -(int)G.pagesize;
         /* remember size for munmap */
@@ -148,6 +149,14 @@ static int rpm_gettags(const char *filename)
         G.map = mmap(0, storepos, PROT_READ, MAP_PRIVATE, fd, 0);
         if (G.map == MAP_FAILED)
                 bb_perror_msg_and_die("mmap '%s'", filename);
+#else
+# undef munmap
+# define munmap(p, l) free(p)
+        /* Allocate memory for the store */
+        G.map = xmalloc(storepos);
+        xlseek(fd, 0, SEEK_SET);
+        full_read(fd, G.map, storepos);
+#endif
 
         return fd;
 }
@@ -294,6 +303,9 @@ static void extract_cpio(int fd, const char *source_rpm)
 
         if (source_rpm != NULL) {
                 /* Binary rpm (it was built from some SRPM), install to root */
+#if ENABLE_PLATFORM_MINGW32
+                if (chdir_system_drive())
+#endif
                 xchdir("/");
         } /* else: SRPM, install to current dir */
 
diff --git a/archival/tar.c b/archival/tar.c
index 3ef89fb0a..54961ff07 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -161,11 +161,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 */
@@ -527,15 +529,21 @@ static int FAST_FUNC writeFileToTarball(const char *fileName, struct stat *statb
                 }
         }
 
+#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 (exclude_file(tbInfo->excludeList, header_name))
                 return SKIP;
@@ -592,7 +600,8 @@ static int FAST_FUNC writeFileToTarball(const char *fileName, struct stat *statb
         return TRUE;
 }
 
-# if SEAMLESS_COMPRESSION
+#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)
 {
@@ -661,7 +670,28 @@ static void NOINLINE vfork_compressor(int tar_fd, const char *gzip)
                 bb_perror_msg_and_die("can't execute '%s'", gzip);
         }
 }
-# endif /* SEAMLESS_COMPRESSION */
+#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 */
 
 
 # if !SEAMLESS_COMPRESSION
@@ -677,17 +707,20 @@ static NOINLINE int writeTarFile(
         const char *gzip)
 {
         int errorFlag = FALSE;
+        IF_PLATFORM_MINGW32(pid_t pid = 0;)
 
         /*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);
-# endif
+                IF_PLATFORM_MINGW32(pid = )vfork_compressor(tbInfo->tarFd, gzip);
+#endif
 
         /* Read the directory/files and iterate over them one at a time */
         while (filelist) {
@@ -720,7 +753,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_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 466794031..4e8ed0eae 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -70,6 +70,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__)
@@ -345,6 +348,9 @@ static void unzip_create_leading_dirs(const char *fn)
 }
 
 #if ENABLE_FEATURE_UNZIP_CDF
+#if ENABLE_PLATFORM_MINGW32
+#define unzip_extract_symlink(s, z, d) unzip_extract_symlink(z, d)
+#endif
 static void unzip_extract_symlink(llist_t **symlink_placeholders,
                 zip_header_t *zip,
                 const char *dst_fn)
@@ -489,7 +495,7 @@ int unzip_main(int argc, char **argv)
         llist_t *zaccept = NULL;
         llist_t *zreject = NULL;
         char *base_dir = NULL;
-#if ENABLE_FEATURE_UNZIP_CDF
+#if ENABLE_FEATURE_UNZIP_CDF && !ENABLE_PLATFORM_MINGW32
         llist_t *symlink_placeholders = NULL;
 #endif
         int i;
@@ -596,7 +602,7 @@ int unzip_main(int argc, char **argv)
                 }
         }
 
-#ifndef __GLIBC__
+#if !defined(__GLIBC__) && !ENABLE_PLATFORM_MINGW32
         /*
          * This code is needed for non-GNU getopt
          * which doesn't understand "-" in option string.