Merge branch 'busybox'

9 files changed, 43 insertions, 36 deletions

diff --git a/archival/Config.src b/archival/Config.src
index 449914565..6f4f30c43 100644
--- a/archival/Config.src
+++ b/archival/Config.src
@@ -1,6 +1,6 @@
 #
 # For a description of the syntax of this configuration file,
-# see scripts/kbuild/config-language.txt.
+# see docs/Kconfig-language.txt.
 #
 
 menu "Archival Utilities"
diff --git a/archival/cpio.c b/archival/cpio.c
index 308ec1b25..9cacf9de6 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -64,15 +64,17 @@
 //usage:     "\n        -p DIR  Copy files to DIR"
 //usage:        )
 //usage:     "\nOptions:"
+//usage:        IF_FEATURE_CPIO_O(
+//usage:     "\n        -H newc Archive format"
+//usage:        )
 //usage:     "\n        -d      Make leading directories"
 //usage:     "\n        -m      Preserve mtime"
 //usage:     "\n        -v      Verbose"
 //usage:     "\n        -u      Overwrite"
 //usage:     "\n        -F FILE Input (-t,-i,-p) or output (-o) file"
 //usage:     "\n        -R USER[:GRP]   Set owner of created files"
-//usage:        IF_FEATURE_CPIO_O(
-//usage:     "\n        -H newc Archive format"
-//usage:        )
+//usage:     "\n        -L      Dereference symlinks"
+//usage:     "\n        -0      Input is separated by NULs"
 
 /* GNU cpio 2.9 --help (abridged):
 
@@ -374,6 +376,7 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
 #endif
                 "owner\0"        Required_argument "R"
                 "verbose\0"      No_argument       "v"
+                "null\0"         No_argument       "0"
                 "quiet\0"        No_argument       "\xff"
                 "to-stdout\0"    No_argument       "\xfe"
                 ;
@@ -508,7 +511,7 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
         while (get_header_cpio(archive_handle) == EXIT_SUCCESS)
                 continue;
 
-        create_symlinks_from_list(archive_handle->symlink_placeholders);
+        create_links_from_list(archive_handle->link_placeholders);
 
         if (archive_handle->cpio__blocks != (off_t)-1
          && !(opt & OPT_QUIET)
diff --git a/archival/gzip.c b/archival/gzip.c
index c5a1fe9b4..74d5d685f 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -333,12 +333,6 @@ struct globals {
         /* DECLARE(Pos, head, 1<<HASH_BITS); */
 #define head (G1.prev + WSIZE) /* hash head (see deflate.c) */
 
-/* =========================================================================== */
-/* all members below are zeroed out in pack_gzip() for each next file */
-
-        uint32_t crc;   /* shift register contents */
-        /*uint32_t *crc_32_tab;*/
-
 #if ENABLE_FEATURE_GZIP_LEVELS
         unsigned max_chain_length;
         unsigned max_lazy_match;
@@ -350,6 +344,12 @@ struct globals {
 #define nice_match       (G1.nice_match)
 #endif
 
+/* =========================================================================== */
+/* all members below are zeroed out in pack_gzip() for each next file */
+
+        uint32_t crc;   /* shift register contents */
+        /*uint32_t *crc_32_tab;*/
+
 /* window position at the beginning of the current output block. Gets
  * negative when the window is moved backwards.
  */
diff --git a/archival/libarchive/data_extract_all.c b/archival/libarchive/data_extract_all.c
index 8fa69ffaf..4c95db4a6 100644
--- a/archival/libarchive/data_extract_all.c
+++ b/archival/libarchive/data_extract_all.c
@@ -122,13 +122,10 @@ 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) {
-                        /* shared message */
-                        bb_perror_msg("can't create %slink '%s' to '%s'",
-                                "hard", dst_name, hard_link
-                        );
-                }
+                create_or_remember_link(&archive_handle->link_placeholders,
+                                hard_link,
+                                dst_name,
+                                1);
                 /* Hardlinks have no separate mode/ownership, skip chown/chmod */
                 goto ret;
         }
@@ -195,9 +192,10 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
                  *
                  * Untarring bug.tar would otherwise place evil.py in '/tmp'.
                  */
-                create_or_remember_symlink(&archive_handle->symlink_placeholders,
+                create_or_remember_link(&archive_handle->link_placeholders,
                                 file_header->link_target,
-                                dst_name);
+                                dst_name,
+                                0);
                 break;
         case S_IFSOCK:
         case S_IFBLK:
diff --git a/archival/libarchive/decompress_unlzma.c b/archival/libarchive/decompress_unlzma.c
index 446319e7b..6886239d0 100644
--- a/archival/libarchive/decompress_unlzma.c
+++ b/archival/libarchive/decompress_unlzma.c
@@ -350,8 +350,12 @@ unpack_lzma_stream(transformer_state_t *xstate)
                                                 state = state < LZMA_NUM_LIT_STATES ? 9 : 11;
 
                                                 pos = buffer_pos - rep0;
-                                                if ((int32_t)pos < 0)
+                                                if ((int32_t)pos < 0) {
                                                         pos += header.dict_size;
+                                                        /* see unzip_bad_lzma_2.zip: */
+                                                        if (pos >= buffer_size)
+                                                                goto bad;
+                                                }
                                                 previous_byte = buffer[pos];
                                                 goto one_byte1;
 #else
diff --git a/archival/libarchive/get_header_ar.c b/archival/libarchive/get_header_ar.c
index adcde46d5..7ce9c615c 100644
--- a/archival/libarchive/get_header_ar.c
+++ b/archival/libarchive/get_header_ar.c
@@ -126,7 +126,7 @@ char FAST_FUNC get_header_ar(archive_handle_t *archive_handle)
                         struct archive_handle_t *sa = archive_handle->dpkg__sub_archive;
                         while (archive_handle->dpkg__action_data_subarchive(sa) == EXIT_SUCCESS)
                                 continue;
-                        create_symlinks_from_list(sa->symlink_placeholders);
+                        create_links_from_list(sa->link_placeholders);
                 } else
 #endif
                         archive_handle->action_data(archive_handle);
diff --git a/archival/libarchive/unsafe_symlink_target.c b/archival/libarchive/unsafe_symlink_target.c
index 0ad4c9392..f53881f2f 100644
--- a/archival/libarchive/unsafe_symlink_target.c
+++ b/archival/libarchive/unsafe_symlink_target.c
@@ -5,15 +5,16 @@
 #include "libbb.h"
 #include "bb_archive.h"
 
-void FAST_FUNC create_or_remember_symlink(llist_t **symlink_placeholders
+void FAST_FUNC create_or_remember_link(llist_t **link_placeholders
                 IF_PLATFORM_MINGW32(UNUSED_PARAM),
                 const char *target,
-                const char *linkname)
+                const char *linkname,
+                int hard_link IF_PLATFORM_MINGW32(UNUSED_PARAM))
 {
 #if !ENABLE_PLATFORM_MINGW32
-        if (target[0] == '/' || strstr(target, "..")) {
-                llist_add_to(symlink_placeholders,
-                        xasprintf("%s%c%s", linkname, '\0', target)
+        if (hard_link || target[0] == '/' || strstr(target, "..")) {
+                llist_add_to_end(link_placeholders,
+                        xasprintf("%c%s%c%s", hard_link, linkname, '\0', target)
                 );
                 return;
         }
@@ -30,17 +31,17 @@ void FAST_FUNC create_or_remember_symlink(llist_t **symlink_placeholders
 }
 
 #if !ENABLE_PLATFORM_MINGW32
-void FAST_FUNC create_symlinks_from_list(llist_t *list)
+void FAST_FUNC create_links_from_list(llist_t *list)
 {
         while (list) {
                 char *target;
 
-                target = list->data + strlen(list->data) + 1;
-                if (symlink(target, list->data)) {
+                target = list->data + 1 + strlen(list->data + 1) + 1;
+                if ((*list->data ? link : symlink) (target, list->data + 1)) {
                         /* shared message */
                         bb_error_msg_and_die("can't create %slink '%s' to '%s'",
-                                "sym",
-                                list->data, target
+                                *list->data ? "hard" : "sym",
+                                list->data + 1, target
                         );
                 }
                 list = list->link;
diff --git a/archival/tar.c b/archival/tar.c
index afd8cfec5..e1af27401 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -1279,7 +1279,7 @@ 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);
+        create_links_from_list(tar_handle->link_placeholders);
 
         /* Check that every file that should have been extracted was */
         while (tar_handle->accept) {
diff --git a/archival/unzip.c b/archival/unzip.c
index 369c6c028..a9b7dc10f 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -375,9 +375,10 @@ static void unzip_extract_symlink(llist_t **symlink_placeholders,
                 target[xstate.mem_output_size] = '\0';
 #endif
         }
-        create_or_remember_symlink(symlink_placeholders,
+        create_or_remember_link(symlink_placeholders,
                         target,
-                        dst_fn);
+                        dst_fn,
+                        0);
         free(target);
 }
 #endif
@@ -993,7 +994,7 @@ int unzip_main(int argc, char **argv)
         }
 
 #if ENABLE_FEATURE_UNZIP_CDF
-        create_symlinks_from_list(symlink_placeholders);
+        create_links_from_list(symlink_placeholders);
 #endif
 
         if ((opts & OPT_l) && quiet <= 1) {