17 files changed, 435 insertions, 320 deletions

diff --git a/archival/ar.c b/archival/ar.c
index ea36bda88..d113bc6ca 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -254,11 +254,16 @@ int ar_main(int argc UNUSED_PARAM, char **argv)
 
         archive_handle = init_handle();
 
-        /* --: prepend '-' to the first argument if required */
-        /* -1: at least one param is reqd */
-        /* one of p,t,x[,r] is required */
-        opt_complementary = "--:-1:p:t:x"IF_FEATURE_AR_CREATE(":r");
-        opt = getopt32(argv, "voc""ptx"IF_FEATURE_AR_CREATE("r"));
+        /* prepend '-' to the first argument if required */
+        if (argv[1] && argv[1][0] != '-' && argv[1][0] != '\0')
+                argv[1] = xasprintf("-%s", argv[1]);
+        opt = getopt32(argv, "^"
+                "voc""ptx"IF_FEATURE_AR_CREATE("r")
+                "\0"
+                /* -1: at least one arg is reqd */
+                /* one of p,t,x[,r] is required */
+                "-1:p:t:x"IF_FEATURE_AR_CREATE(":r")
+        );
         argv += optind;
 
         t = opt / FIRST_CMD;
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index f91dd25eb..34a2e8e96 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -319,7 +319,7 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv)
 //config:       select FEATURE_GZIP_DECOMPRESS
 //config:       help
 //config:       gunzip is used to decompress archives created by gzip.
-//config:       You can use the `-t' option to test the integrity of
+//config:       You can use the '-t' option to test the integrity of
 //config:       an archive, without decompressing it.
 //config:
 //config:config ZCAT
@@ -391,9 +391,10 @@ int gunzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int gunzip_main(int argc UNUSED_PARAM, char **argv)
 {
 #if ENABLE_FEATURE_GUNZIP_LONG_OPTIONS
-        applet_long_options = gunzip_longopts;
-#endif
+        getopt32long(argv, "cfkvqdtn", gunzip_longopts);
+#else
         getopt32(argv, "cfkvqdtn");
+#endif
         argv += optind;
 
         /* If called as zcat...
diff --git a/archival/bzip2.c b/archival/bzip2.c
index 0b9c508df..d578eb7ad 100644
--- a/archival/bzip2.c
+++ b/archival/bzip2.c
@@ -195,9 +195,11 @@ int bzip2_main(int argc UNUSED_PARAM, char **argv)
          * --best        alias for -9
          */
 
-        opt_complementary = "s2"; /* -s means -2 (compatibility) */
-        /* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */
-        opt = getopt32(argv, "cfkv" IF_FEATURE_BZIP2_DECOMPRESS("dt") "123456789qzs");
+        opt = getopt32(argv, "^"
+                /* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */
+                "cfkv" IF_FEATURE_BZIP2_DECOMPRESS("dt") "123456789qzs"
+                "\0" "s2" /* -s means -2 (compatibility) */
+        );
 #if ENABLE_FEATURE_BZIP2_DECOMPRESS /* bunzip2_main may not be visible... */
         if (opt & 0x30) // -d and/or -t
                 return bunzip2_main(argc, argv);
diff --git a/archival/cpio.c b/archival/cpio.c
index 38bab8257..f2165be3a 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -360,9 +360,8 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
         char *cpio_owner;
         IF_FEATURE_CPIO_O(const char *cpio_fmt = "";)
         unsigned opt;
-
 #if ENABLE_LONG_OPTS
-        applet_long_options =
+        const char *long_opts =
                 "extract\0"      No_argument       "i"
                 "list\0"         No_argument       "t"
 #if ENABLE_FEATURE_CPIO_O
@@ -390,9 +389,9 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
         /* -L makes sense only with -o or -p */
 
 #if !ENABLE_FEATURE_CPIO_O
-        opt = getopt32(argv, OPTION_STR, &cpio_filename, &cpio_owner);
+        opt = getopt32long(argv, OPTION_STR, long_opts, &cpio_filename, &cpio_owner);
 #else
-        opt = getopt32(argv, OPTION_STR "oH:" IF_FEATURE_CPIO_P("p"),
+        opt = getopt32long(argv, OPTION_STR "oH:" IF_FEATURE_CPIO_P("p"), long_opts,
                        &cpio_filename, &cpio_owner, &cpio_fmt);
 #endif
         argv += optind;
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 90ad8766c..852e0cac2 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -1766,8 +1766,7 @@ int dpkg_main(int argc UNUSED_PARAM, char **argv)
 
         INIT_G();
 
-        IF_LONG_OPTS(applet_long_options = dpkg_longopts);
-        opt = getopt32(argv, "CilPruF:", &str_f);
+        opt = getopt32long(argv, "CilPruF:", dpkg_longopts, &str_f);
         argv += optind;
         //if (opt & OPT_configure) ... // -C
         if (opt & OPT_force) { // -F (--force in official dpkg)
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index 029bc4af1..f6bf9eb04 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -80,8 +80,9 @@ int dpkg_deb_main(int argc UNUSED_PARAM, char **argv)
 #endif
 
         /* Must have 1 or 2 args */
-        opt_complementary = "-1:?2:c--efXx:e--cfXx:f--ceXx:X--cefx:x--cefX";
-        opt = getopt32(argv, "cefXx");
+        opt = getopt32(argv, "^" "cefXx"
+                        "\0" "-1:?2:c--efXx:e--cfXx:f--ceXx:X--cefx:x--cefX"
+        );
         argv += optind;
         //argc -= optind;
 
diff --git a/archival/gzip.c b/archival/gzip.c
index 4cf34ac28..9c53895e9 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -2216,11 +2216,12 @@ int gzip_main(int argc UNUSED_PARAM, char **argv)
         SET_PTR_TO_GLOBALS((char *)xzalloc(sizeof(struct globals)+sizeof(struct globals2))
                         + sizeof(struct globals));
 
-#if ENABLE_FEATURE_GZIP_LONG_OPTIONS
-        applet_long_options = gzip_longopts;
-#endif
         /* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */
+#if ENABLE_FEATURE_GZIP_LONG_OPTIONS
+        opt = getopt32long(argv, "cfkv" IF_FEATURE_GZIP_DECOMPRESS("dt") "qn123456789", gzip_longopts);
+#else
         opt = getopt32(argv, "cfkv" IF_FEATURE_GZIP_DECOMPRESS("dt") "qn123456789");
+#endif
 #if ENABLE_FEATURE_GZIP_DECOMPRESS /* gunzip_main may not be visible... */
         if (opt & 0x30) // -d and/or -t
                 return gunzip_main(argc, argv);
diff --git a/archival/libarchive/Kbuild.src b/archival/libarchive/Kbuild.src
index 942e755b9..e1a8a7529 100644
--- a/archival/libarchive/Kbuild.src
+++ b/archival/libarchive/Kbuild.src
@@ -12,6 +12,8 @@ COMMON_FILES:= \
         data_extract_all.o \
         data_extract_to_stdout.o \
 \
+        unsafe_symlink_target.o \
+\
         filter_accept_all.o \
         filter_accept_list.o \
         filter_accept_reject_list.o \
diff --git a/archival/libarchive/data_extract_all.c b/archival/libarchive/data_extract_all.c
index 1ce927c2f..e658444e0 100644
--- a/archival/libarchive/data_extract_all.c
+++ b/archival/libarchive/data_extract_all.c
@@ -129,9 +129,7 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
                 if (res != 0 && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)) {
                         /* shared message */
                         bb_perror_msg("can't create %slink '%s' to '%s'",
-                                        "hard",
-                                        dst_name,
-                                        hard_link
+                                "hard", dst_name, hard_link
                         );
                 }
                 /* Hardlinks have no separate mode/ownership, skip chown/chmod */
@@ -181,7 +179,9 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
 //TODO: what if file_header->link_target == NULL (say, corrupted tarball?)
 
                 /* To avoid a directory traversal attack via symlinks,
-                 * for certain link targets postpone creation of symlinks.
+                 * do not restore symlinks with ".." components
+                 * or symlinks starting with "/", unless a magic
+                 * envvar is set.
                  *
                  * For example, consider a .tar created via:
                  *  $ tar cvf bug.tar anything.txt
@@ -199,24 +199,17 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
                  *
                  * Untarring bug.tar would otherwise place evil.py in '/tmp'.
                  */
-                if (file_header->link_target[0] == '/'
-                 || strstr(file_header->link_target, "..")
-                ) {
-                        llist_add_to(&archive_handle->symlink_placeholders,
-                                xasprintf("%s%c%s", file_header->name, '\0', file_header->link_target)
-                        );
-                        break;
-                }
-                res = symlink(file_header->link_target, dst_name);
-                if (res != 0
-                 && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
-                ) {
-                        /* shared message */
-                        bb_perror_msg("can't create %slink '%s' to '%s'",
-                                "sym",
-                                dst_name,
-                                file_header->link_target
-                        );
+                if (!unsafe_symlink_target(file_header->link_target)) {
+                        res = symlink(file_header->link_target, dst_name);
+                        if (res != 0
+                         && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
+                        ) {
+                                /* shared message */
+                                bb_perror_msg("can't create %slink '%s' to '%s'",
+                                        "sym",
+                                        dst_name, file_header->link_target
+                                );
+                        }
                 }
                 break;
         case S_IFSOCK:
diff --git a/archival/libarchive/decompress_unxz.c b/archival/libarchive/decompress_unxz.c
index 350e5358a..0be85500c 100644
--- a/archival/libarchive/decompress_unxz.c
+++ b/archival/libarchive/decompress_unxz.c
@@ -37,7 +37,6 @@ static uint32_t xz_crc32(const uint8_t *buf, size_t size, uint32_t crc)
  || !defined(put_unaligned_be32)
 # error get_unaligned_le32 accessors are not defined
 #endif
-#define get_le32(p) (*(uint32_t*)(p))
 
 #include "unxz/xz_dec_bcj.c"
 #include "unxz/xz_dec_lzma2.c"
diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c
index 641256787..7d912152c 100644
--- a/archival/libarchive/open_transformer.c
+++ b/archival/libarchive/open_transformer.c
@@ -251,18 +251,8 @@ static transformer_state_t *setup_transformer_on_fd(int fd, int fail_if_not_comp
         return 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)
+static void fork_transformer_and_free(transformer_state_t *xstate)
 {
-        transformer_state_t *xstate = setup_transformer_on_fd(fd, fail_if_not_compressed);
-
-        if (!xstate || !xstate->xformer) {
-                free(xstate);
-                return 1;
-        }
-
 # if BB_MMU
         fork_transformer_with_no_sig(xstate->src_fd, xstate->xformer);
 # else
@@ -270,13 +260,39 @@ int FAST_FUNC setup_unzip_on_fd(int fd, int fail_if_not_compressed)
          * an external unzipper that wants
          * file position at the start of the file.
          */
-        xlseek(fd, - xstate->signature_skipped, SEEK_CUR);
+        xlseek(xstate->src_fd, - xstate->signature_skipped, SEEK_CUR);
         xstate->signature_skipped = 0;
         fork_transformer_with_sig(xstate->src_fd, xstate->xformer, xstate->xformer_prog);
 # endif
         free(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)
+{
+        transformer_state_t *xstate = setup_transformer_on_fd(fd, fail_if_not_compressed);
+
+        if (!xstate->xformer) {
+                free(xstate);
+                return 1;
+        }
+
+        fork_transformer_and_free(xstate);
         return 0;
 }
+#if ENABLE_FEATURE_SEAMLESS_LZMA
+/* ...and custom version for LZMA */
+void FAST_FUNC setup_lzma_on_fd(int fd)
+{
+        transformer_state_t *xstate = xzalloc(sizeof(*xstate));
+        xstate->src_fd = fd;
+        xstate->xformer = unpack_lzma_stream;
+        USE_FOR_NOMMU(xstate->xformer_prog = "unlzma";)
+        fork_transformer_and_free(xstate);
+}
+#endif
 
 static transformer_state_t *open_transformer(const char *fname, int fail_if_not_compressed)
 {
diff --git a/archival/libarchive/unsafe_symlink_target.c b/archival/libarchive/unsafe_symlink_target.c
new file mode 100644
index 000000000..441ba8b24
--- /dev/null
+++ b/archival/libarchive/unsafe_symlink_target.c
@@ -0,0 +1,48 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+#include "libbb.h"
+#include "bb_archive.h"
+
+int FAST_FUNC unsafe_symlink_target(const char *target)
+{
+        const char *dot;
+
+        if (target[0] == '/') {
+                const char *var;
+ unsafe:
+                var = getenv("EXTRACT_UNSAFE_SYMLINKS");
+                if (var) {
+                        if (LONE_CHAR(var, '1'))
+                                return 0; /* pretend it's safe */
+                        return 1; /* "UNSAFE!" */
+                }
+                bb_error_msg("skipping unsafe symlink to '%s' in archive,"
+                        " set %s=1 to extract",
+                        target,
+                        "EXTRACT_UNSAFE_SYMLINKS"
+                );
+                /* Prevent further messages */
+                setenv("EXTRACT_UNSAFE_SYMLINKS", "0", 0);
+                return 1; /* "UNSAFE!" */
+        }
+
+        dot = target;
+        for (;;) {
+                dot = strchr(dot, '.');
+                if (!dot)
+                        return 0; /* safe target */
+
+                /* Is it a path component starting with ".."? */
+                if ((dot[1] == '.')
+                 && (dot == target || dot[-1] == '/')
+                    /* Is it exactly ".."? */
+                 && (dot[2] == '/' || dot[2] == '\0')
+                ) {
+                        goto unsafe;
+                }
+                /* NB: it can even be trailing ".", should only add 1 */
+                dot += 1;
+        }
+}
diff --git a/archival/lzop.c b/archival/lzop.c
index df18ff170..1bf954f4f 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -1138,7 +1138,7 @@ int lzop_main(int argc UNUSED_PARAM, char **argv)
         /* -U is "anti -k", invert bit for bbunpack(): */
         option_mask32 ^= OPT_KEEP;
         /* -k disables -U (if any): */
-        /* opt_complementary = "k-U"; - nope, only handles -Uk, not -kU */
+        /* opt_complementary "k-U"? - nope, only handles -Uk, not -kU */
         if (option_mask32 & OPT_k)
                 option_mask32 |= OPT_KEEP;
 
diff --git a/archival/rpm.c b/archival/rpm.c
index 98039d499..790eeb59d 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -6,7 +6,6 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 //config:config RPM
 //config:       bool "rpm (33 kb)"
 //config:       default y
@@ -14,19 +13,8 @@
 //config:       Mini RPM applet - queries and extracts RPM packages.
 
 //applet:IF_RPM(APPLET(rpm, BB_DIR_BIN, BB_SUID_DROP))
-//kbuild:lib-$(CONFIG_RPM) += rpm.o
 
-//usage:#define rpm_trivial_usage
-//usage:       "-i PACKAGE.rpm; rpm -qp[ildc] PACKAGE.rpm"
-//usage:#define rpm_full_usage "\n\n"
-//usage:       "Manipulate RPM packages\n"
-//usage:     "\nCommands:"
-//usage:     "\n        -i      Install package"
-//usage:     "\n        -qp     Query package"
-//usage:     "\n        -qpi    Show information"
-//usage:     "\n        -qpl    List contents"
-//usage:     "\n        -qpd    List documents"
-//usage:     "\n        -qpc    List config files"
+//kbuild:lib-$(CONFIG_RPM) += rpm.o
 
 #include "libbb.h"
 #include "common_bufsiz.h"
@@ -68,6 +56,8 @@
 #define TAG_DIRINDEXES          1116
 #define TAG_BASENAMES           1117
 #define TAG_DIRNAMES            1118
+#define TAG_PAYLOADCOMPRESSOR   1125
+
 
 #define RPMFILE_CONFIG          (1 << 0)
 #define RPMFILE_DOC             (1 << 1)
@@ -91,148 +81,145 @@ typedef struct {
 
 struct globals {
         void *map;
-        rpm_index **mytags;
+        rpm_index *mytags;
         int tagcount;
+        unsigned mapsize, pagesize;
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { setup_common_bufsiz(); } while (0)
 
-static void extract_cpio(int fd, const char *source_rpm)
-{
-        archive_handle_t *archive_handle;
-
-        if (source_rpm != NULL) {
-                /* Binary rpm (it was built from some SRPM), install to root */
-                xchdir("/");
-        } /* else: SRPM, install to current dir */
-
-        /* Initialize */
-        archive_handle = init_handle();
-        archive_handle->seek = seek_by_read;
-        archive_handle->action_data = data_extract_all;
-#if 0 /* For testing (rpm -i only lists the files in internal cpio): */
-        archive_handle->action_header = header_list;
-        archive_handle->action_data = data_skip;
-#endif
-        archive_handle->ah_flags = ARCHIVE_RESTORE_DATE | ARCHIVE_CREATE_LEADING_DIRS
-                /* compat: overwrite existing files.
-                 * try "rpm -i foo.src.rpm" few times in a row -
-                 * standard rpm will not complain.
-                 */
-                | ARCHIVE_REPLACE_VIA_RENAME;
-        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);
-        while (get_header_cpio(archive_handle) == EXIT_SUCCESS)
-                continue;
-}
-
-static rpm_index **rpm_gettags(int fd, int *num_tags)
+static int rpm_gettags(const char *filename)
 {
-        /* We should never need more than 200 (shrink via realloc later) */
-        rpm_index **tags = xzalloc(200 * sizeof(tags[0]));
-        int pass, tagindex = 0;
-
-        xlseek(fd, 96, SEEK_CUR); /* Seek past the unused lead */
+        rpm_index *tags;
+        int fd;
+        unsigned pass, idx;
+        unsigned storepos;
+
+        if (!filename) { /* rpm2cpio w/o filename? */
+                filename = bb_msg_standard_output;
+                fd = 0;
+        } else {
+                fd = xopen(filename, O_RDONLY);
+        }
 
+        storepos = xlseek(fd, 96, SEEK_CUR); /* Seek past the unused lead */
+        G.tagcount = 0;
+        tags = NULL;
+        idx = 0;
         /* 1st pass is the signature headers, 2nd is the main stuff */
         for (pass = 0; pass < 2; pass++) {
                 struct rpm_header header;
-                rpm_index *tmpindex;
-                int storepos;
+                unsigned cnt;
 
                 xread(fd, &header, sizeof(header));
                 if (header.magic_and_ver != htonl(RPM_HEADER_MAGICnVER))
-                        return NULL; /* Invalid magic, or not version 1 */
+                        bb_error_msg_and_die("invalid RPM header magic in '%s'", filename);
                 header.size = ntohl(header.size);
-                header.entries = ntohl(header.entries);
-                storepos = xlseek(fd, 0, SEEK_CUR) + header.entries * 16;
-
-                while (header.entries--) {
-                        tmpindex = tags[tagindex++] = xmalloc(sizeof(*tmpindex));
-                        xread(fd, tmpindex, sizeof(*tmpindex));
-                        tmpindex->tag = ntohl(tmpindex->tag);
-                        tmpindex->type = ntohl(tmpindex->type);
-                        tmpindex->count = ntohl(tmpindex->count);
-                        tmpindex->offset = storepos + ntohl(tmpindex->offset);
+                cnt = ntohl(header.entries);
+                storepos += sizeof(header) + cnt * 16;
+
+                G.tagcount += cnt;
+                tags = xrealloc(tags, sizeof(tags[0]) * G.tagcount);
+                xread(fd, &tags[idx], sizeof(tags[0]) * cnt);
+                while (cnt--) {
+                        rpm_index *tag = &tags[idx];
+                        tag->tag = ntohl(tag->tag);
+                        tag->type = ntohl(tag->type);
+                        tag->count = ntohl(tag->count);
+                        tag->offset = storepos + ntohl(tag->offset);
                         if (pass == 0)
-                                tmpindex->tag -= 743;
+                                tag->tag -= 743;
+                        idx++;
                 }
-                storepos = xlseek(fd, header.size, SEEK_CUR); /* Seek past store */
                 /* Skip padding to 8 byte boundary after reading signature headers */
                 if (pass == 0)
-                        xlseek(fd, (-storepos) & 0x7, SEEK_CUR);
+                        while (header.size & 7)
+                                header.size++;
+                /* Seek past store */
+                storepos = xlseek(fd, header.size, SEEK_CUR);
         }
-        /* realloc tags to save space */
-        tags = xrealloc(tags, tagindex * sizeof(tags[0]));
-        *num_tags = tagindex;
-        /* All done, leave the file at the start of the gzipped cpio archive */
-        return tags;
+        G.mytags = tags;
+
+        /* Map the store */
+        storepos = (storepos + G.pagesize) & -(int)G.pagesize;
+        /* remember size for munmap */
+        G.mapsize = storepos;
+        /* some NOMMU systems prefer MAP_PRIVATE over MAP_SHARED */
+        G.map = mmap(0, storepos, PROT_READ, MAP_PRIVATE, fd, 0);
+        if (G.map == MAP_FAILED)
+                bb_perror_msg_and_die("mmap '%s'", filename);
+
+        return fd;
 }
 
 static int bsearch_rpmtag(const void *key, const void *item)
 {
         int *tag = (int *)key;
-        rpm_index **tmp = (rpm_index **) item;
-        return (*tag - tmp[0]->tag);
-}
-
-static int rpm_getcount(int tag)
-{
-        rpm_index **found;
-        found = bsearch(&tag, G.mytags, G.tagcount, sizeof(struct rpmtag *), bsearch_rpmtag);
-        if (!found)
-                return 0;
-        return found[0]->count;
+        rpm_index *tmp = (rpm_index *) item;
+        return (*tag - tmp->tag);
 }
 
 static char *rpm_getstr(int tag, int itemindex)
 {
-        rpm_index **found;
-        found = bsearch(&tag, G.mytags, G.tagcount, sizeof(struct rpmtag *), bsearch_rpmtag);
-        if (!found || itemindex >= found[0]->count)
+        rpm_index *found;
+        found = bsearch(&tag, G.mytags, G.tagcount, sizeof(G.mytags[0]), bsearch_rpmtag);
+        if (!found || itemindex >= found->count)
                 return NULL;
-        if (found[0]->type == RPM_STRING_TYPE
-         || found[0]->type == RPM_I18NSTRING_TYPE
-         || found[0]->type == RPM_STRING_ARRAY_TYPE
+        if (found->type == RPM_STRING_TYPE
+         || found->type == RPM_I18NSTRING_TYPE
+         || found->type == RPM_STRING_ARRAY_TYPE
         ) {
                 int n;
-                char *tmpstr = (char *) G.map + found[0]->offset;
+                char *tmpstr = (char *) G.map + found->offset;
                 for (n = 0; n < itemindex; n++)
                         tmpstr = tmpstr + strlen(tmpstr) + 1;
                 return tmpstr;
         }
         return NULL;
 }
+static char *rpm_getstr0(int tag)
+{
+        return rpm_getstr(tag, 0);
+}
+
+#if ENABLE_RPM
 
 static int rpm_getint(int tag, int itemindex)
 {
-        rpm_index **found;
+        rpm_index *found;
         char *tmpint;
 
         /* gcc throws warnings here when sizeof(void*)!=sizeof(int) ...
          * it's ok to ignore it because tag won't be used as a pointer */
-        found = bsearch(&tag, G.mytags, G.tagcount, sizeof(struct rpmtag *), bsearch_rpmtag);
-        if (!found || itemindex >= found[0]->count)
+        found = bsearch(&tag, G.mytags, G.tagcount, sizeof(G.mytags[0]), bsearch_rpmtag);
+        if (!found || itemindex >= found->count)
                 return -1;
 
-        tmpint = (char *) G.map + found[0]->offset;
-        if (found[0]->type == RPM_INT32_TYPE) {
+        tmpint = (char *) G.map + found->offset;
+        if (found->type == RPM_INT32_TYPE) {
                 tmpint += itemindex*4;
                 return ntohl(*(int32_t*)tmpint);
         }
-        if (found[0]->type == RPM_INT16_TYPE) {
+        if (found->type == RPM_INT16_TYPE) {
                 tmpint += itemindex*2;
                 return ntohs(*(int16_t*)tmpint);
         }
-        if (found[0]->type == RPM_INT8_TYPE) {
+        if (found->type == RPM_INT8_TYPE) {
                 tmpint += itemindex;
                 return *(int8_t*)tmpint;
         }
         return -1;
 }
 
+static int rpm_getcount(int tag)
+{
+        rpm_index *found;
+        found = bsearch(&tag, G.mytags, G.tagcount, sizeof(G.mytags[0]), bsearch_rpmtag);
+        if (!found)
+                return 0;
+        return found->count;
+}
+
 static void fileaction_dobackup(char *filename, int fileref)
 {
         struct stat oldfile;
@@ -273,11 +260,103 @@ static void loop_through_files(int filetag, void (*fileaction)(char *filename, i
         }
 }
 
+#if 0 //DEBUG
+static void print_all_tags(void)
+{
+        unsigned i = 0;
+        while (i < G.tagcount) {
+                rpm_index *tag = &G.mytags[i];
+                if (tag->type == RPM_STRING_TYPE
+                 || tag->type == RPM_I18NSTRING_TYPE
+                 || tag->type == RPM_STRING_ARRAY_TYPE
+                ) {
+                        unsigned n;
+                        char *str = (char *) G.map + tag->offset;
+
+                        printf("tag[%u] %08x type %08x offset %08x count %d '%s'\n",
+                                i, tag->tag, tag->type, tag->offset, tag->count, str
+                        );
+                        for (n = 1; n < tag->count; n++) {
+                                str += strlen(str) + 1;
+                                printf("\t'%s'\n", str);
+                        }
+                }
+                i++;
+        }
+}
+#else
+#define print_all_tags() ((void)0)
+#endif
+
+static void extract_cpio(int fd, const char *source_rpm)
+{
+        archive_handle_t *archive_handle;
+
+        if (source_rpm != NULL) {
+                /* Binary rpm (it was built from some SRPM), install to root */
+                xchdir("/");
+        } /* else: SRPM, install to current dir */
+
+        /* Initialize */
+        archive_handle = init_handle();
+        archive_handle->seek = seek_by_read;
+        archive_handle->action_data = data_extract_all;
+#if 0 /* For testing (rpm -i only lists the files in internal cpio): */
+        archive_handle->action_header = header_list;
+        archive_handle->action_data = data_skip;
+#endif
+        archive_handle->ah_flags = ARCHIVE_RESTORE_DATE | ARCHIVE_CREATE_LEADING_DIRS
+                /* compat: overwrite existing files.
+                 * try "rpm -i foo.src.rpm" few times in a row -
+                 * standard rpm will not complain.
+                 */
+                | ARCHIVE_REPLACE_VIA_RENAME;
+        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);
+        while (get_header_cpio(archive_handle) == EXIT_SUCCESS)
+                continue;
+}
+
+//usage:#define rpm_trivial_usage
+//usage:       "-i PACKAGE.rpm; rpm -qp[ildc] PACKAGE.rpm"
+//usage:#define rpm_full_usage "\n\n"
+//usage:       "Manipulate RPM packages\n"
+//usage:     "\nCommands:"
+//usage:     "\n        -i      Install package"
+//usage:     "\n        -qp     Query package"
+//usage:     "\n        -qpi    Show information"
+//usage:     "\n        -qpl    List contents"
+//usage:     "\n        -qpd    List documents"
+//usage:     "\n        -qpc    List config files"
+
+/* RPM version 4.13.0.1:
+ * Unlike -q, -i seems to imply -p: -i, -ip and -pi work the same.
+ * OTOH, with -q order is important: "-piq FILE.rpm" works as -qp, not -qpi
+ * (IOW: shows only package name, not package info).
+ * "-iq ARG" works as -q: treats ARG as package name, not a file.
+ *
+ * "man rpm" on -l option and options implying it:
+ * -l, --list           List files in package.
+ * -c, --configfiles    List only configuration files (implies -l).
+ * -d, --docfiles       List only documentation files (implies -l).
+ * -L, --licensefiles   List only license files (implies -l).
+ * --dump       Dump file information as follows (implies -l):
+ *              path size mtime digest mode owner group isconfig isdoc rdev symlink
+ * -s, --state  Display the states of files in the package (implies -l).
+ *              The state of each file is one of normal, not installed, or replaced.
+ *
+ * Looks like we can switch to getopt32 here: in practice, people
+ * do place -q first if they intend to use it (misinterpreting "-piq" wouldn't matter).
+ */
 int rpm_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int rpm_main(int argc, char **argv)
 {
         int opt, func = 0;
-        const unsigned pagesize = getpagesize();
+
+        INIT_G();
+        G.pagesize = getpagesize();
 
         while ((opt = getopt(argc, argv, "iqpldc")) != -1) {
                 switch (opt) {
@@ -289,17 +368,17 @@ int rpm_main(int argc, char **argv)
                         if (func) bb_show_usage();
                         func = rpm_query;
                         break;
-                case 'p': /* Query a package */
+                case 'p': /* Query a package (IOW: .rpm file, we are not querying RPMDB) */
                         func |= rpm_query_package;
                         break;
                 case 'l': /* List files in a package */
                         func |= rpm_query_list;
                         break;
-                case 'd': /* List doc files in a package (implies list) */
+                case 'd': /* List doc files in a package (implies -l) */
                         func |= rpm_query_list;
                         func |= rpm_query_list_doc;
                         break;
-                case 'c': /* List config files in a package (implies list) */
+                case 'c': /* List config files in a package (implies -l) */
                         func |= rpm_query_list;
                         func |= rpm_query_list_config;
                         break;
@@ -313,24 +392,18 @@ int rpm_main(int argc, char **argv)
                 bb_show_usage();
         }
 
-        while (*argv) {
+        for (;;) {
                 int rpm_fd;
-                unsigned mapsize;
                 const char *source_rpm;
 
-                rpm_fd = xopen(*argv++, O_RDONLY);
-                G.mytags = rpm_gettags(rpm_fd, &G.tagcount);
-                if (!G.mytags)
-                        bb_error_msg_and_die("error reading rpm header");
-                mapsize = xlseek(rpm_fd, 0, SEEK_CUR);
-                mapsize = (mapsize + pagesize) & -(int)pagesize;
-                /* Some NOMMU systems prefer MAP_PRIVATE over MAP_SHARED */
-                G.map = mmap(0, mapsize, PROT_READ, MAP_PRIVATE, rpm_fd, 0);
-//FIXME: error check?
+                rpm_fd = rpm_gettags(*argv);
+                print_all_tags();
 
-                source_rpm = rpm_getstr(TAG_SOURCERPM, 0);
+                source_rpm = rpm_getstr0(TAG_SOURCERPM);
 
                 if (func & rpm_install) {
+                        /* -i (and not -qi) */
+
                         /* Backup any config files */
                         loop_through_files(TAG_BASENAMES, fileaction_dobackup);
                         /* Extact the archive */
@@ -338,10 +411,13 @@ int rpm_main(int argc, char **argv)
                         /* Set the correct file uid/gid's */
                         loop_through_files(TAG_BASENAMES, fileaction_setowngrp);
                 }
-                else if ((func & (rpm_query|rpm_query_package)) == (rpm_query|rpm_query_package)) {
+                else
+                if ((func & (rpm_query|rpm_query_package)) == (rpm_query|rpm_query_package)) {
+                        /* -qp */
+
                         if (!(func & (rpm_query_info|rpm_query_list))) {
                                 /* If just a straight query, just give package name */
-                                printf("%s-%s-%s\n", rpm_getstr(TAG_NAME, 0), rpm_getstr(TAG_VERSION, 0), rpm_getstr(TAG_RELEASE, 0));
+                                printf("%s-%s-%s\n", rpm_getstr0(TAG_NAME), rpm_getstr0(TAG_VERSION), rpm_getstr0(TAG_RELEASE));
                         }
                         if (func & rpm_query_info) {
                                 /* Do the nice printout */
@@ -350,30 +426,33 @@ int rpm_main(int argc, char **argv)
                                 char bdatestring[50];
                                 const char *p;
 
-                                printf("%-12s: %s\n", "Name"        , rpm_getstr(TAG_NAME, 0));
+                                printf("%-12s: %s\n", "Name"        , rpm_getstr0(TAG_NAME));
                                 /* TODO compat: add "Epoch" here */
-                                printf("%-12s: %s\n", "Version"     , rpm_getstr(TAG_VERSION, 0));
-                                printf("%-12s: %s\n", "Release"     , rpm_getstr(TAG_RELEASE, 0));
+                                printf("%-12s: %s\n", "Version"     , rpm_getstr0(TAG_VERSION));
+                                printf("%-12s: %s\n", "Release"     , rpm_getstr0(TAG_RELEASE));
                                 /* add "Architecture" */
-                                printf("%-12s: %s\n", "Install Date", "(not installed)");
-                                printf("%-12s: %s\n", "Group"       , rpm_getstr(TAG_GROUP, 0));
+                                /* printf("%-12s: %s\n", "Install Date", "(not installed)"); - we don't know */
+                                printf("%-12s: %s\n", "Group"       , rpm_getstr0(TAG_GROUP));
                                 printf("%-12s: %d\n", "Size"        , rpm_getint(TAG_SIZE, 0));
-                                printf("%-12s: %s\n", "License"     , rpm_getstr(TAG_LICENSE, 0));
+                                printf("%-12s: %s\n", "License"     , rpm_getstr0(TAG_LICENSE));
                                 /* add "Signature" */
                                 printf("%-12s: %s\n", "Source RPM"  , source_rpm ? source_rpm : "(none)");
                                 bdate_time = rpm_getint(TAG_BUILDTIME, 0);
                                 bdate_ptm = localtime(&bdate_time);
                                 strftime(bdatestring, 50, "%a %d %b %Y %T %Z", bdate_ptm);
                                 printf("%-12s: %s\n", "Build Date"  , bdatestring);
-                                printf("%-12s: %s\n", "Build Host"  , rpm_getstr(TAG_BUILDHOST, 0));
-                                p = rpm_getstr(TAG_PREFIXS, 0);
+                                printf("%-12s: %s\n", "Build Host"  , rpm_getstr0(TAG_BUILDHOST));
+                                p = rpm_getstr0(TAG_PREFIXS);
                                 printf("%-12s: %s\n", "Relocations" , p ? p : "(not relocatable)");
                                 /* add "Packager" */
-                                p = rpm_getstr(TAG_VENDOR, 0);
-                                printf("%-12s: %s\n", "Vendor"      , p ? p : "(none)");
-                                printf("%-12s: %s\n", "URL"         , rpm_getstr(TAG_URL, 0));
-                                printf("%-12s: %s\n", "Summary"     , rpm_getstr(TAG_SUMMARY, 0));
-                                printf("Description :\n%s\n", rpm_getstr(TAG_DESCRIPTION, 0));
+                                p = rpm_getstr0(TAG_VENDOR);
+                                if (p) /* rpm 4.13.0.1 does not show "(none)" for Vendor: */
+                                printf("%-12s: %s\n", "Vendor"      , p);
+                                p = rpm_getstr0(TAG_URL);
+                                if (p) /* rpm 4.13.0.1 does not show "(none)"/"(null)" for URL: */
+                                printf("%-12s: %s\n", "URL"         , p);
+                                printf("%-12s: %s\n", "Summary"     , rpm_getstr0(TAG_SUMMARY));
+                                printf("Description :\n%s\n", rpm_getstr0(TAG_DESCRIPTION));
                         }
                         if (func & rpm_query_list) {
                                 int count, it, flags;
@@ -396,10 +475,85 @@ int rpm_main(int argc, char **argv)
                                                 rpm_getstr(TAG_BASENAMES, it));
                                 }
                         }
+                } else {
+                        /* Unsupported (help text shows what we support) */
+                        bb_show_usage();
                 }
-                munmap(G.map, mapsize);
+                if (!*++argv)
+                        break;
+                munmap(G.map, G.mapsize);
                 free(G.mytags);
                 close(rpm_fd);
         }
+
         return 0;
 }
+
+#endif /* RPM */
+
+/*
+ * Mini rpm2cpio implementation for busybox
+ *
+ * Copyright (C) 2001 by Laurence Anderson
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+//config:config RPM2CPIO
+//config:       bool "rpm2cpio (20 kb)"
+//config:       default y
+//config:       help
+//config:       Converts a RPM file into a CPIO archive.
+
+//applet:IF_RPM2CPIO(APPLET(rpm2cpio, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_RPM2CPIO) += rpm.o
+
+//usage:#define rpm2cpio_trivial_usage
+//usage:       "PACKAGE.rpm"
+//usage:#define rpm2cpio_full_usage "\n\n"
+//usage:       "Output a cpio archive of the rpm file"
+
+#if ENABLE_RPM2CPIO
+
+/* No getopt required */
+int rpm2cpio_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
+{
+        const char *str;
+        int rpm_fd;
+
+        INIT_G();
+        G.pagesize = getpagesize();
+
+        rpm_fd = rpm_gettags(argv[1]);
+
+        //if (SEAMLESS_COMPRESSION) - we do this at the end instead.
+        //      /* We need to know whether child (gzip/bzip/etc) exits abnormally */
+        //      signal(SIGCHLD, check_errors_in_children);
+
+        if (ENABLE_FEATURE_SEAMLESS_LZMA
+         && (str = rpm_getstr0(TAG_PAYLOADCOMPRESSOR)) != NULL
+         && strcmp(str, "lzma") == 0
+        ) {
+                // lzma compression can't be detected
+                // set up decompressor without detection
+                setup_lzma_on_fd(rpm_fd);
+        } else {
+                setup_unzip_on_fd(rpm_fd, /*fail_if_not_compressed:*/ 1);
+        }
+
+        if (bb_copyfd_eof(rpm_fd, STDOUT_FILENO) < 0)
+                bb_error_msg_and_die("error unpacking");
+
+        if (ENABLE_FEATURE_CLEAN_UP) {
+                close(rpm_fd);
+        }
+
+        if (SEAMLESS_COMPRESSION) {
+                check_errors_in_children(0);
+                return bb_got_signal;
+        }
+        return EXIT_SUCCESS;
+}
+
+#endif /* RPM2CPIO */
diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
deleted file mode 100644
index 3e4a6a249..000000000
--- a/archival/rpm2cpio.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * Mini rpm2cpio implementation for busybox
- *
- * Copyright (C) 2001 by Laurence Anderson
- *
- * Licensed under GPLv2 or later, see file LICENSE in this source tree.
- */
-
-//config:config RPM2CPIO
-//config:       bool "rpm2cpio (20 kb)"
-//config:       default y
-//config:       help
-//config:       Converts a RPM file into a CPIO archive.
-
-//applet:IF_RPM2CPIO(APPLET(rpm2cpio, BB_DIR_USR_BIN, BB_SUID_DROP))
-//kbuild:lib-$(CONFIG_RPM2CPIO) += rpm2cpio.o
-
-//usage:#define rpm2cpio_trivial_usage
-//usage:       "package.rpm"
-//usage:#define rpm2cpio_full_usage "\n\n"
-//usage:       "Output a cpio archive of the rpm file"
-
-#include "libbb.h"
-#include "bb_archive.h"
-#include "rpm.h"
-
-enum { rpm_fd = STDIN_FILENO };
-
-static unsigned skip_header(void)
-{
-        struct rpm_header header;
-        unsigned len;
-
-        xread(rpm_fd, &header, sizeof(header));
-//      if (strncmp((char *) &header.magic, RPM_HEADER_MAGIC_STR, 3) != 0) {
-//              bb_error_msg_and_die("invalid RPM header magic");
-//      }
-//      if (header.version != 1) {
-//              bb_error_msg_and_die("unsupported RPM header version");
-//      }
-        if (header.magic_and_ver != htonl(RPM_HEADER_MAGICnVER)) {
-                bb_error_msg_and_die("invalid RPM header magic or unsupported version");
-                // ": %x != %x", header.magic_and_ver, htonl(RPM_HEADER_MAGICnVER));
-        }
-
-        /* Seek past index entries, and past store */
-        len = 16 * ntohl(header.entries) + ntohl(header.size);
-        seek_by_jump(rpm_fd, len);
-
-        return sizeof(header) + len;
-}
-
-/* No getopt required */
-int rpm2cpio_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
-{
-        struct rpm_lead lead;
-        unsigned pos;
-
-        if (argv[1]) {
-                xmove_fd(xopen(argv[1], O_RDONLY), rpm_fd);
-        }
-        xread(rpm_fd, &lead, sizeof(lead));
-
-        /* Just check the magic, the rest is irrelevant */
-        if (lead.magic != htonl(RPM_LEAD_MAGIC)) {
-                bb_error_msg_and_die("invalid RPM magic");
-        }
-
-        /* Skip the signature header, align to 8 bytes */
-        pos = skip_header();
-        seek_by_jump(rpm_fd, (-(int)pos) & 7);
-
-        /* Skip the main header */
-        skip_header();
-
-        //if (SEAMLESS_COMPRESSION)
-        //      /* We need to know whether child (gzip/bzip/etc) exits abnormally */
-        //      signal(SIGCHLD, check_errors_in_children);
-
-        /* This works, but doesn't report uncompress errors (they happen in child) */
-        setup_unzip_on_fd(rpm_fd, /*fail_if_not_compressed:*/ 1);
-        if (bb_copyfd_eof(rpm_fd, STDOUT_FILENO) < 0)
-                bb_error_msg_and_die("error unpacking");
-
-        if (ENABLE_FEATURE_CLEAN_UP) {
-                close(rpm_fd);
-        }
-
-        if (SEAMLESS_COMPRESSION) {
-                check_errors_in_children(0);
-                return bb_got_signal;
-        }
-        return EXIT_SUCCESS;
-}
diff --git a/archival/tar.c b/archival/tar.c
index d90a5dc4f..503444796 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -278,23 +278,6 @@ static void chksum_and_xwrite(int fd, struct tar_header_t* hp)
         xwrite(fd, hp, sizeof(*hp));
 }
 
-static void replace_symlink_placeholders(llist_t *list)
-{
-        while (list) {
-                char *target;
-
-                target = list->data + strlen(list->data) + 1;
-                if (symlink(target, list->data)) {
-                        /* shared message */
-                        bb_error_msg_and_die("can't create %slink '%s' to '%s'",
-                                "sym",
-                                list->data, target
-                        );
-                }
-                list = list->link;
-        }
-}
-
 #if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
 static void writeLongname(int fd, int type, const char *name, int dir)
 {
@@ -969,6 +952,11 @@ static const char tar_longopts[] ALIGN1 =
         "exclude\0"             Required_argument "\xff"
 # endif
         ;
+# define GETOPT32 getopt32long
+# define LONGOPTS ,tar_longopts
+#else
+# define GETOPT32 getopt32
+# define LONGOPTS
 #endif
 
 int tar_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -995,21 +983,8 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
                 tar_handle->ah_flags |= ARCHIVE_DONT_RESTORE_PERM;
 
         /* Prepend '-' to the first argument if required */
-        opt_complementary = "--:" // first arg is options
-                "tt:vv:" // count -t,-v
-#if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
-                "\xff::" // --exclude=PATTERN is a list
-#endif
-                IF_FEATURE_TAR_CREATE("c:") "t:x:" // at least one of these is reqd
-                IF_FEATURE_TAR_CREATE("c--tx:t--cx:x--ct") // mutually exclusive
-                IF_NOT_FEATURE_TAR_CREATE("t--x:x--t") // mutually exclusive
-#if ENABLE_FEATURE_TAR_LONG_OPTIONS
-                ":\xf9+" // --strip-components=NUM
-#endif
-        ;
-#if ENABLE_FEATURE_TAR_LONG_OPTIONS
-        applet_long_options = tar_longopts;
-#endif
+        if (argv[1] && argv[1][0] != '-' && argv[1][0] != '\0')
+                argv[1] = xasprintf("-%s", argv[1]);
 #if ENABLE_DESKTOP
         /* Lie to buildroot when it starts asking stupid questions. */
         if (argv[1] && strcmp(argv[1], "--version") == 0) {
@@ -1046,7 +1021,7 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
                 }
         }
 #endif
-        opt = getopt32(argv,
+        opt = GETOPT32(argv, "^"
                 "txC:f:Oopvk"
                 IF_FEATURE_TAR_CREATE(   "ch"    )
                 IF_FEATURE_SEAMLESS_BZ2( "j"     )
@@ -1057,6 +1032,18 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
                 IF_FEATURE_SEAMLESS_Z(   "Z"     )
                 IF_FEATURE_TAR_NOPRESERVE_TIME("m")
                 IF_FEATURE_TAR_LONG_OPTIONS("\xf9:") // --strip-components
+                "\0"
+                "tt:vv:" // count -t,-v
+#if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
+                "\xff::" // --exclude=PATTERN is a list
+#endif
+                IF_FEATURE_TAR_CREATE("c:") "t:x:" // at least one of these is reqd
+                IF_FEATURE_TAR_CREATE("c--tx:t--cx:x--ct") // mutually exclusive
+                IF_NOT_FEATURE_TAR_CREATE("t--x:x--t") // mutually exclusive
+#if ENABLE_FEATURE_TAR_LONG_OPTIONS
+                ":\xf9+" // --strip-components=NUM
+#endif
+                LONGOPTS
                 , &base_dir // -C dir
                 , &tar_filename // -f filename
                 IF_FEATURE_TAR_FROM(, &(tar_handle->accept)) // T
@@ -1280,8 +1267,6 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
         while (get_header_tar(tar_handle) == EXIT_SUCCESS)
                 bb_got_signal = EXIT_SUCCESS; /* saw at least one header, good */
 
-        replace_symlink_placeholders(tar_handle->symlink_placeholders);
-
         /* Check that every file that should have been extracted was */
         while (tar_handle->accept) {
                 if (!find_list_entry(tar_handle->reject, tar_handle->accept->data)
diff --git a/archival/unzip.c b/archival/unzip.c
index f37ea3519..233487697 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -371,9 +371,15 @@ static void unzip_extract_symlink(zip_header_t *zip, const char *dst_fn)
                 target[xstate.mem_output_size] = '\0';
 #endif
         }
+        if (!unsafe_symlink_target(target)) {
 //TODO: libbb candidate
-        if (symlink(target, dst_fn))
-                bb_perror_msg_and_die("can't create symlink '%s'", dst_fn);
+                if (symlink(target, dst_fn)) {
+                        /* shared message */
+                        bb_perror_msg_and_die("can't create %slink '%s' to '%s'",
+                                "sym", dst_fn, target
+                        );
+                }
+        }
         free(target);
 }
 #endif