Merge branch 'busybox' into merge

3 files changed, 11 insertions, 9 deletions

diff --git a/archival/cpio.c b/archival/cpio.c
index 1d6cbd1e2..308ec1b25 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -508,6 +508,8 @@ 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);
+
         if (archive_handle->cpio__blocks != (off_t)-1
          && !(opt & OPT_QUIET)
         ) {
diff --git a/archival/libarchive/data_extract_to_command.c b/archival/libarchive/data_extract_to_command.c
index 1114a95cb..0fcabb4a9 100644
--- a/archival/libarchive/data_extract_to_command.c
+++ b/archival/libarchive/data_extract_to_command.c
@@ -37,7 +37,7 @@ static const char *const tar_var[] = {
 static void xputenv(char *str)
 {
         if (putenv(str))
-                bb_error_msg_and_die(bb_msg_memory_exhausted);
+                bb_die_memory_exhausted();
 }
 
 static void str2env(char *env[], int idx, const char *str)
diff --git a/archival/tar.c b/archival/tar.c
index d0684b69e..308ce7701 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -792,7 +792,7 @@ static llist_t *append_file_list_to_list(llist_t *list)
 //usage:        IF_FEATURE_SEAMLESS_LZMA("a")
 //usage:        IF_FEATURE_TAR_CREATE("h")
 //usage:        IF_FEATURE_TAR_NOPRESERVE_TIME("m")
-//usage:        "vO] "
+//usage:        "vokO] "
 //usage:        "[-f TARFILE] [-C DIR] "
 //usage:        IF_FEATURE_TAR_FROM("[-T FILE] [-X FILE] "IF_FEATURE_TAR_LONG_OPTIONS("[--exclude PATTERN]... "))
 //usage:        "[FILE]..."
@@ -809,6 +809,13 @@ static llist_t *append_file_list_to_list(llist_t *list)
 //usage:     "\n        -f FILE Name of TARFILE ('-' for stdin/out)"
 //usage:     "\n        -C DIR  Change to DIR before operation"
 //usage:     "\n        -v      Verbose"
+//usage:     "\n        -O      Extract to stdout"
+//usage:        IF_FEATURE_TAR_NOPRESERVE_TIME(
+//usage:     "\n        -m      Don't restore mtime"
+//usage:        )
+//usage:     "\n        -o      Don't restore user:group"
+///////:-p - accepted but ignored, restores mode (aliases in GNU tar: --preserve-permissions, --same-permissions)
+//usage:     "\n        -k      Don't replace existing files"
 //usage:        IF_FEATURE_SEAMLESS_Z(
 //usage:     "\n        -Z      (De)compress using compress"
 //usage:        )
@@ -824,13 +831,9 @@ static llist_t *append_file_list_to_list(llist_t *list)
 //usage:        IF_FEATURE_SEAMLESS_LZMA(
 //usage:     "\n        -a      (De)compress using lzma"
 //usage:        )
-//usage:     "\n        -O      Extract to stdout"
 //usage:        IF_FEATURE_TAR_CREATE(
 //usage:     "\n        -h      Follow symlinks"
 //usage:        )
-//usage:        IF_FEATURE_TAR_NOPRESERVE_TIME(
-//usage:     "\n        -m      Don't restore mtime"
-//usage:        )
 //usage:        IF_FEATURE_TAR_FROM(
 //usage:     "\n        -T FILE File with names to include"
 //usage:     "\n        -X FILE File with glob patterns to exclude"
@@ -844,9 +847,6 @@ static llist_t *append_file_list_to_list(llist_t *list)
 //usage:       "$ tar -cf /tmp/tarball.tar /usr/local\n"
 
 // Supported but aren't in --help:
-//      o       no-same-owner
-//      p       same-permissions
-//      k       keep-old
 //      no-recursion
 //      numeric-owner
 //      no-same-permissions