4 files changed, 49 insertions, 65 deletions

diff --git a/archival/libarchive/data_extract_all.c b/archival/libarchive/data_extract_all.c
index d3a6df5e8..8fa69ffaf 100644
--- a/archival/libarchive/data_extract_all.c
+++ b/archival/libarchive/data_extract_all.c
@@ -107,9 +107,7 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
                         }
                 }
                 else if (existing_sb.st_mtime >= file_header->mtime) {
-                        if (!(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
-                         && !S_ISDIR(file_header->mode)
-                        ) {
+                        if (!S_ISDIR(file_header->mode)) {
                                 bb_error_msg("%s not created: newer or "
                                         "same age file exists", dst_name);
                         }
@@ -125,7 +123,7 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
         /* Handle hard links separately */
         if (hard_link) {
                 res = link(hard_link, dst_name);
-                if (res != 0 && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)) {
+                if (res != 0) {
                         /* shared message */
                         bb_perror_msg("can't create %slink '%s' to '%s'",
                                 "hard", dst_name, hard_link
@@ -165,10 +163,9 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
         }
         case S_IFDIR:
                 res = mkdir(dst_name, file_header->mode);
-                if ((res == -1)
+                if ((res != 0)
                  && (errno != EISDIR) /* btw, Linux doesn't return this */
                  && (errno != EEXIST)
-                 && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
                 ) {
                         bb_perror_msg("can't make dir %s", dst_name);
                 }
@@ -198,27 +195,16 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
                  *
                  * Untarring bug.tar would otherwise place evil.py in '/tmp'.
                  */
-                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
-                                );
-                        }
-                }
+                create_or_remember_symlink(&archive_handle->symlink_placeholders,
+                                file_header->link_target,
+                                dst_name);
                 break;
         case S_IFSOCK:
         case S_IFBLK:
         case S_IFCHR:
         case S_IFIFO:
                 res = mknod(dst_name, file_header->mode, file_header->device);
-                if ((res == -1)
-                 && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
-                ) {
+                if (res != 0) {
                         bb_perror_msg("can't create node %s", dst_name);
                 }
                 break;
diff --git a/archival/libarchive/unsafe_symlink_target.c b/archival/libarchive/unsafe_symlink_target.c
index 441ba8b24..8dcafeaa1 100644
--- a/archival/libarchive/unsafe_symlink_target.c
+++ b/archival/libarchive/unsafe_symlink_target.c
@@ -5,44 +5,37 @@
 #include "libbb.h"
 #include "bb_archive.h"
 
-int FAST_FUNC unsafe_symlink_target(const char *target)
+void FAST_FUNC create_or_remember_symlink(llist_t **symlink_placeholders,
+                const char *target,
+                const char *linkname)
 {
-        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"
+        if (target[0] == '/' || strstr(target, "..")) {
+                llist_add_to(symlink_placeholders,
+                        xasprintf("%s%c%s", linkname, '\0', target)
+                );
+                return;
+        }
+        if (symlink(target, linkname) != 0) {
+                /* shared message */
+                bb_perror_msg_and_die("can't create %slink '%s' to '%s'",
+                        "sym", linkname, target
                 );
-                /* Prevent further messages */
-                setenv("EXTRACT_UNSAFE_SYMLINKS", "0", 0);
-                return 1; /* "UNSAFE!" */
         }
+}
 
-        dot = target;
-        for (;;) {
-                dot = strchr(dot, '.');
-                if (!dot)
-                        return 0; /* safe target */
+void FAST_FUNC create_symlinks_from_list(llist_t *list)
+{
+        while (list) {
+                char *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;
+                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
+                        );
                 }
-                /* NB: it can even be trailing ".", should only add 1 */
-                dot += 1;
+                list = list->link;
         }
 }
diff --git a/archival/tar.c b/archival/tar.c
index fbe5e3be8..d0684b69e 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -1279,6 +1279,8 @@ 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 */
 
+        create_symlinks_from_list(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 fb58b62c0..369c6c028 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -348,7 +348,9 @@ static void unzip_create_leading_dirs(const char *fn)
 }
 
 #if ENABLE_FEATURE_UNZIP_CDF
-static void unzip_extract_symlink(zip_header_t *zip, const char *dst_fn)
+static void unzip_extract_symlink(llist_t **symlink_placeholders,
+                zip_header_t *zip,
+                const char *dst_fn)
 {
         char *target;
 
@@ -373,15 +375,9 @@ 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)) {
-                        /* shared message */
-                        bb_perror_msg_and_die("can't create %slink '%s' to '%s'",
-                                "sym", dst_fn, target
-                        );
-                }
-        }
+        create_or_remember_symlink(symlink_placeholders,
+                        target,
+                        dst_fn);
         free(target);
 }
 #endif
@@ -493,6 +489,9 @@ int unzip_main(int argc, char **argv)
         llist_t *zaccept = NULL;
         llist_t *zreject = NULL;
         char *base_dir = NULL;
+#if ENABLE_FEATURE_UNZIP_CDF
+        llist_t *symlink_placeholders = NULL;
+#endif
         int i;
         char key_buf[80]; /* must match size used by my_fgets80 */
 
@@ -957,7 +956,7 @@ int unzip_main(int argc, char **argv)
 #if ENABLE_FEATURE_UNZIP_CDF
                         if (S_ISLNK(file_mode)) {
                                 if (dst_fd != STDOUT_FILENO) /* not -p? */
-                                        unzip_extract_symlink(&zip, dst_fn);
+                                        unzip_extract_symlink(&symlink_placeholders, &zip, dst_fn);
                         } else
 #endif
                         {
@@ -993,6 +992,10 @@ int unzip_main(int argc, char **argv)
                 total_entries++;
         }
 
+#if ENABLE_FEATURE_UNZIP_CDF
+        create_symlinks_from_list(symlink_placeholders);
+#endif
+
         if ((opts & OPT_l) && quiet <= 1) {
                 if (!verbose) {
                         //      "  Length      Date    Time    Name\n"