16 files changed, 192 insertions, 28 deletions

diff --git a/archival/Config.src b/archival/Config.src
index 6f4f30c43..cbcd7217c 100644
--- a/archival/Config.src
+++ b/archival/Config.src
@@ -35,4 +35,15 @@ config FEATURE_LZMA_FAST
         This option reduces decompression time by about 25% at the cost of
         a 1K bigger binary.
 
+config FEATURE_PATH_TRAVERSAL_PROTECTION
+        bool "Prevent extraction of filenames with /../ path component"
+        default n
+        help
+        busybox tar and unzip remove "PREFIX/../" (if it exists)
+        from extracted names.
+        This option enables this behavior for all other unpacking applets,
+        such as cpio, ar, rpm.
+        GNU cpio 2.15 has NO such sanity check.
+# try other archivers and document their behavior?
+
 endmenu
diff --git a/archival/ar.c b/archival/ar.c
index 320cbae72..16bb33227 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -30,12 +30,12 @@
 //config:config FEATURE_AR_LONG_FILENAMES
 //config:       bool "Support long filenames (not needed for debs)"
 //config:       default y
-//config:       depends on AR
+//config:       depends on AR || MAKE || PDPMAKE
 //config:       help
 //config:       By default the ar format can only store the first 15 characters
 //config:       of the filename, this option removes that limitation.
 //config:       It supports the GNU ar long filename method which moves multiple long
-//config:       filenames into a the data section of a new ar entry.
+//config:       filenames into the data section of a new ar entry.
 //config:
 //config:config FEATURE_AR_CREATE
 //config:       bool "Support archive creation"
@@ -153,6 +153,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);
 
@@ -161,8 +164,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;
@@ -184,12 +193,20 @@ 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);
+                if (ENABLE_FEATURE_CLEAN_UP)
+                        free(temp_fn);
+        }
+#endif
+
         return EXIT_SUCCESS;
 }
 #endif /* FEATURE_AR_CREATE */
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index b7944a62a..1f1f28b61 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -71,8 +71,8 @@ int FAST_FUNC bbunpack(char **argv,
                                         goto err;
                         } else {
                                 /* "clever zcat" with FILE */
-                                /* fail_if_not_compressed because zcat refuses uncompressed input */
-                                int fd = open_zipped(filename, /*fail_if_not_compressed:*/ 1);
+                                /* die_if_not_compressed because zcat refuses uncompressed input */
+                                int fd = open_zipped(filename, /*die_if_not_compressed:*/ 1);
                                 if (fd < 0)
                                         goto err_name;
                                 xmove_fd(fd, STDIN_FILENO);
@@ -80,7 +80,7 @@ int FAST_FUNC bbunpack(char **argv,
                 } else
                 if (option_mask32 & BBUNPK_SEAMLESS_MAGIC) {
                         /* "clever zcat" on stdin */
-                        if (setup_unzip_on_fd(STDIN_FILENO, /*fail_if_not_compressed*/ 1))
+                        if (setup_unzip_on_fd(STDIN_FILENO, /*die_if_not_compressed*/ 1))
                                 goto err;
                 }
 
@@ -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/cpio.c b/archival/cpio.c
index f0d990048..38d826a3c 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -49,7 +49,7 @@
 //config:config FEATURE_CPIO_RENUMBER_INODES
 //config:       bool "Support --renumber-inodes like GNU cpio"
 //config:       default y
-//config:       depends on FEATURE_CPIO_O && LONG_OPTS
+//config:       depends on FEATURE_CPIO_O && LONG_OPTS && (PLATFORM_POSIX || FEATURE_EXTRA_FILE_DATA)
 //config:       help
 //config:       Optionally renumber inodes when creating archives.
 
@@ -275,6 +275,7 @@ static NOINLINE int cpio_o(void)
                         if (!(S_ISLNK(st.st_mode) || S_ISREG(st.st_mode)))
                                 st.st_size = 0; /* paranoia */
 
+#if ENABLE_PLATFORM_POSIX || ENABLE_FEATURE_EXTRA_FILE_DATA
                         /* Store hardlinks for later processing, dont output them */
                         if (!S_ISDIR(st.st_mode) && st.st_nlink > 1) {
                                 struct name_s *n;
@@ -310,6 +311,7 @@ static NOINLINE int cpio_o(void)
                                 free(line);
                                 continue;
                         }
+#endif
 #if ENABLE_FEATURE_CPIO_RENUMBER_INODES
                         else if (option_mask32 & OPT_RENUMBER_INODES) {
                                 st.st_ino = ++G.next_inode;
@@ -345,10 +347,18 @@ static NOINLINE int cpio_o(void)
                         }
                 }
 
+#if ENABLE_PLATFORM_POSIX || ENABLE_FEATURE_EXTRA_FILE_DATA
 #if ENABLE_FEATURE_CPIO_IGNORE_DEVNO
                 if (option_mask32 & OPT_IGNORE_DEVNO)
                         st.st_dev = st.st_rdev = 0;
 #endif
+#endif
+
+                if (sizeof(st.st_size) > 4
+                 && st.st_size > (off_t)0xffffffff
+                ) {
+                        bb_error_msg_and_die("error: file '%s' is larger than 4GB", name);
+                }
 
                 bytes += printf("070701"
                                 "%08X%08X%08X%08X%08X%08X%08X"
@@ -421,6 +431,7 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
 #endif
 #endif
                 "owner\0"        Required_argument "R"
+                "file\0"         Required_argument "F"
                 "verbose\0"      No_argument       "v"
                 "null\0"         No_argument       "0"
                 "quiet\0"        No_argument       "\xff"
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 8031956e9..a6a8333a8 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,
@@ -1770,6 +1775,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:
@@ -1814,6 +1823,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/Kbuild.src b/archival/libarchive/Kbuild.src
index d2f284b08..1b1dabbf5 100644
--- a/archival/libarchive/Kbuild.src
+++ b/archival/libarchive/Kbuild.src
@@ -47,6 +47,8 @@ lib-$(CONFIG_DPKG_DEB)                  += $(DPKG_FILES)
 
 lib-$(CONFIG_AR)                        += get_header_ar.o unpack_ar_archive.o
 lib-$(CONFIG_CPIO)                      += get_header_cpio.o
+lib-$(CONFIG_MAKE)                      += get_header_ar.o unpack_ar_archive.o
+lib-$(CONFIG_PDPMAKE)                   += get_header_ar.o unpack_ar_archive.o
 lib-$(CONFIG_TAR)                       += get_header_tar.o unsafe_prefix.o
 lib-$(CONFIG_FEATURE_TAR_TO_COMMAND)    += data_extract_to_command.o
 lib-$(CONFIG_LZOP)                      += lzo1x_1.o lzo1x_1o.o lzo1x_d.o
diff --git a/archival/libarchive/data_extract_all.c b/archival/libarchive/data_extract_all.c
index 049c2c156..8a69711c1 100644
--- a/archival/libarchive/data_extract_all.c
+++ b/archival/libarchive/data_extract_all.c
@@ -65,6 +65,14 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
                 } while (--n != 0);
         }
 #endif
+#if ENABLE_FEATURE_PATH_TRAVERSAL_PROTECTION
+        /* Strip leading "/" and up to last "/../" path component */
+        dst_name = (char *)strip_unsafe_prefix(dst_name);
+#endif
+// ^^^ This may be a problem if some applets do need to extract absolute names.
+// (Probably will need to invent ARCHIVE_ALLOW_UNSAFE_NAME flag).
+// You might think that rpm needs it, but in my tests rpm's internal cpio
+// archive has names like "./usr/bin/FOO", not "/usr/bin/FOO".
 
         if (archive_handle->ah_flags & ARCHIVE_CREATE_LEADING_DIRS) {
                 char *slash = strrchr(dst_name, '/');
diff --git a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c
index d051ecb81..d2f7a9309 100644
--- a/archival/libarchive/decompress_gunzip.c
+++ b/archival/libarchive/decompress_gunzip.c
@@ -1137,6 +1137,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 {
@@ -1208,6 +1211,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/get_header_tar.c b/archival/libarchive/get_header_tar.c
index cc6f3f0ad..5fd5a7980 100644
--- a/archival/libarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -239,8 +239,13 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
         /* Check header has valid magic, "ustar" is for the proper tar,
          * five NULs are for the old tar format  */
         if (!is_prefixed_with(tar.magic, "ustar")
+#if !ENABLE_PLATFORM_MINGW32
          && (!ENABLE_FEATURE_TAR_OLDGNU_COMPATIBILITY
              || memcmp(tar.magic, "\0\0\0\0", 5) != 0)
+#else
+         && (!ENABLE_FEATURE_TAR_OLDGNU_COMPATIBILITY
+             || memcmp(tar.magic, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 16) != 0)
+#endif
         ) {
 #if ENABLE_FEATURE_TAR_AUTODETECT
  autodetect:
diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c
index 44715ef25..a949c4509 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,12 @@ 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)
+{
+        mingw_fork_compressor(fd, transform_prog, "r");
+}
+#endif
 
 
 #if SEAMLESS_COMPRESSION
@@ -157,7 +164,7 @@ void FAST_FUNC fork_transformer(int fd, const char *transform_prog)
 /* Used by e.g. rpm which gives us a fd without filename,
  * thus we can't guess the format from filename's extension.
  */
-static transformer_state_t *setup_transformer_on_fd(int fd, int fail_if_not_compressed)
+static transformer_state_t *setup_transformer_on_fd(int fd, int die_if_not_compressed)
 {
         transformer_state_t *xstate;
 
@@ -204,7 +211,7 @@ static transformer_state_t *setup_transformer_on_fd(int fd, int fail_if_not_comp
         }
 
         /* No known magic seen */
-        if (fail_if_not_compressed)
+        if (die_if_not_compressed)
                 bb_simple_error_msg_and_die("no gzip"
                         IF_FEATURE_SEAMLESS_BZ2("/bzip2")
                         IF_FEATURE_SEAMLESS_XZ("/xz")
@@ -240,13 +247,15 @@ static void fork_transformer_and_free(transformer_state_t *xstate)
 /* Used by e.g. rpm which gives us a fd without filename,
  * thus we can't guess the format from filename's extension.
  */
-int FAST_FUNC setup_unzip_on_fd(int fd, int fail_if_not_compressed)
+int FAST_FUNC setup_unzip_on_fd(int fd, int die_if_not_compressed)
 {
-        transformer_state_t *xstate = setup_transformer_on_fd(fd, fail_if_not_compressed);
+        transformer_state_t *xstate = setup_transformer_on_fd(fd, die_if_not_compressed);
 
         if (!xstate->xformer) {
+                /* Not compressed */
+                int retval = xstate->signature_skipped; /* never zero */
                 free(xstate);
-                return 1;
+                return retval;
         }
 
         fork_transformer_and_free(xstate);
@@ -264,7 +273,7 @@ void FAST_FUNC setup_lzma_on_fd(int fd)
 }
 #endif
 
-static transformer_state_t *open_transformer(const char *fname, int fail_if_not_compressed)
+static transformer_state_t *open_transformer(const char *fname, int die_if_not_compressed)
 {
         transformer_state_t *xstate;
         int fd;
@@ -284,18 +293,18 @@ static transformer_state_t *open_transformer(const char *fname, int fail_if_not_
                 }
         }
 
-        xstate = setup_transformer_on_fd(fd, fail_if_not_compressed);
+        xstate = setup_transformer_on_fd(fd, die_if_not_compressed);
 
         return xstate;
 }
 
-int FAST_FUNC open_zipped(const char *fname, int fail_if_not_compressed)
+int FAST_FUNC open_zipped(const char *fname, int die_if_not_compressed)
 {
         int fd;
         transformer_state_t *xstate;
 
-        xstate = open_transformer(fname, fail_if_not_compressed);
-        if (!xstate)
+        xstate = open_transformer(fname, die_if_not_compressed);
+        if (!xstate) /* open error */
                 return -1;
 
         fd = xstate->src_fd;
@@ -326,7 +335,7 @@ void* FAST_FUNC xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_
         transformer_state_t *xstate;
         char *image;
 
-        xstate = open_transformer(fname, /*fail_if_not_compressed:*/ 0);
+        xstate = open_transformer(fname, /*die_if_not_compressed:*/ 0);
         if (!xstate) /* file open error */
                 return NULL;
 
@@ -371,7 +380,7 @@ void* FAST_FUNC xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_
         int fd;
         char *image;
 
-        fd = open_zipped(fname, /*fail_if_not_compressed:*/ 0);
+        fd = open_zipped(fname, /*die_if_not_compressed:*/ 0);
         if (fd < 0)
                 return NULL;
 
diff --git a/archival/libarchive/unpack_ar_archive.c b/archival/libarchive/unpack_ar_archive.c
index 125d424c9..923a0b2ab 100644
--- a/archival/libarchive/unpack_ar_archive.c
+++ b/archival/libarchive/unpack_ar_archive.c
@@ -16,6 +16,10 @@ void FAST_FUNC unpack_ar_archive(archive_handle_t *ar_archive)
         }
         ar_archive->offset += AR_MAGIC_LEN;
 
-        while (get_header_ar(ar_archive) == EXIT_SUCCESS)
-                continue;
+        while (get_header_ar(ar_archive) == EXIT_SUCCESS) {
+#if ENABLE_MAKE
+                free(ar_archive->file_header->name);
+                ar_archive->file_header->name = NULL;
+#endif
+        }
 }
diff --git a/archival/libarchive/unsafe_prefix.c b/archival/libarchive/unsafe_prefix.c
index 33e487bf9..667081195 100644
--- a/archival/libarchive/unsafe_prefix.c
+++ b/archival/libarchive/unsafe_prefix.c
@@ -14,7 +14,11 @@ const char* FAST_FUNC strip_unsafe_prefix(const char *str)
                         cp++;
                         continue;
                 }
-                if (is_prefixed_with(cp, "/../"+1)) {
+                /* We are called lots of times.
+                 * is_prefixed_with(cp, "../") is slower than open-coding it,
+                 * with minimal code growth (~few bytes).
+                 */
+                if (cp[0] == '.' && cp[1] == '.' && cp[2] == '/') {
                         cp += 3;
                         continue;
                 }
diff --git a/archival/libarchive/unsafe_symlink_target.c b/archival/libarchive/unsafe_symlink_target.c
index f8dc8033d..d9100f30f 100644
--- a/archival/libarchive/unsafe_symlink_target.c
+++ b/archival/libarchive/unsafe_symlink_target.c
@@ -10,18 +10,26 @@ void FAST_FUNC create_or_remember_link(llist_t **link_placeholders,
                 const char *linkname,
                 int hard_link)
 {
+#if ENABLE_PLATFORM_MINGW32
+        /* defer reporting error if symlink(2) fails on Windows */
+        if (hard_link || target[0] == '/' || strstr(target, "..") ||
+                        symlink(target, linkname) != 0) {
+#else
         if (hard_link || target[0] == '/' || strstr(target, "..")) {
+#endif
                 llist_add_to_end(link_placeholders,
                         xasprintf("%c%s%c%s", hard_link, linkname, '\0', target)
                 );
                 return;
         }
+#if !ENABLE_PLATFORM_MINGW32
         if (symlink(target, linkname) != 0) {
                 /* shared message */
                 bb_perror_msg_and_die("can't create %slink '%s' to '%s'",
                         "sym", linkname, target
                 );
         }
+#endif
 }
 
 void FAST_FUNC create_links_from_list(llist_t *list)
diff --git a/archival/rpm.c b/archival/rpm.c
index af8db99a6..c2f0550ff 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -142,6 +142,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 */
@@ -150,6 +151,14 @@ static int rpm_gettags(const char *filename)
         G.map = mmap_read(fd, storepos);
         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;
 }
@@ -240,6 +249,7 @@ static void fileaction_dobackup(char *filename, int fileref)
         }
 }
 
+#if !ENABLE_PLATFORM_MINGW32
 static void fileaction_setowngrp(char *filename, int fileref)
 {
         /* real rpm warns: "user foo does not exist - using <you>" */
@@ -249,6 +259,7 @@ static void fileaction_setowngrp(char *filename, int fileref)
         int gid = gr ? gr->gr_gid : getgid();
         chown(filename, uid, gid);
 }
+#endif
 
 static void loop_through_files(int filetag, void (*fileaction)(char *filename, int fileref))
 {
@@ -296,6 +307,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 */
 
@@ -316,7 +330,7 @@ static void extract_cpio(int fd, const char *source_rpm)
         archive_handle->src_fd = fd;
         /*archive_handle->offset = 0; - init_handle() did it */
 
-        setup_unzip_on_fd(archive_handle->src_fd, /*fail_if_not_compressed:*/ 1);
+        setup_unzip_on_fd(archive_handle->src_fd, /*die_if_not_compressed:*/ 1);
         while (get_header_cpio(archive_handle) == EXIT_SUCCESS)
                 continue;
 }
@@ -410,8 +424,10 @@ int rpm_main(int argc, char **argv)
                         loop_through_files(TAG_BASENAMES, fileaction_dobackup);
                         /* Extact the archive */
                         extract_cpio(rpm_fd, source_rpm);
+#if !ENABLE_PLATFORM_MINGW32
                         /* Set the correct file uid/gid's */
                         loop_through_files(TAG_BASENAMES, fileaction_setowngrp);
+#endif
                 }
                 else
                 if ((func & (rpm_query|rpm_query_package)) == (rpm_query|rpm_query_package)) {
@@ -533,6 +549,7 @@ int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
         //      /* We need to know whether child (gzip/bzip/etc) exits abnormally */
         //      signal(SIGCHLD, check_errors_in_children);
 
+        str = NULL;
         if (ENABLE_FEATURE_SEAMLESS_LZMA
          && (str = rpm_getstr0(TAG_PAYLOADCOMPRESSOR)) != NULL
          && strcmp(str, "lzma") == 0
@@ -541,7 +558,11 @@ int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
                 // set up decompressor without detection
                 setup_lzma_on_fd(rpm_fd);
         } else {
-                setup_unzip_on_fd(rpm_fd, /*fail_if_not_compressed:*/ 1);
+                int signature_bytes = setup_unzip_on_fd(rpm_fd, /*die_if_not_compressed:*/ 0);
+                if (signature_bytes != 0) {
+                        xlseek(rpm_fd, - signature_bytes, SEEK_CUR);
+                        bb_error_msg("warning, unknown compression '%s'", str);
+                }
         }
 
         if (bb_copyfd_eof(rpm_fd, STDOUT_FILENO) < 0)
diff --git a/archival/tar.c b/archival/tar.c
index d6ca6c1e0..fd20d6ce7 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! */
@@ -1164,7 +1188,7 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
                  * on e.g. tarball with 1st file named "BZh5".
                  */
                 ) {
-                        tar_handle->src_fd = open_zipped(tar_filename, /*fail_if_not_compressed:*/ 0);
+                        tar_handle->src_fd = open_zipped(tar_filename, /*die_if_not_compressed:*/ 0);
                         if (tar_handle->src_fd < 0)
                                 bb_perror_msg_and_die("can't open '%s'", tar_filename);
                 } else {
diff --git a/archival/unzip.c b/archival/unzip.c
index 71a302915..7b945c250 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -72,6 +72,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__)
@@ -634,7 +637,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.