Merge branch 'busybox' into merge

Conflicts:
	include/libbb.h
	shell/ash.c

3 files changed, 11 insertions, 7 deletions

diff --git a/archival/libarchive/Kbuild.src b/archival/libarchive/Kbuild.src
index e2134be4c..58457fc22 100644
--- a/archival/libarchive/Kbuild.src
+++ b/archival/libarchive/Kbuild.src
@@ -45,7 +45,7 @@ lib-$(CONFIG_UNXZ)                      += decompress_unxz.o
 lib-$(CONFIG_CPIO)                      += get_header_cpio.o
 lib-$(CONFIG_DPKG)                      += $(DPKG_FILES)
 lib-$(CONFIG_DPKG_DEB)                  += $(DPKG_FILES)
-lib-$(CONFIG_GUNZIP)                    += decompress_gunzip.o
+lib-$(CONFIG_GUNZIP)                    += open_transformer.o decompress_gunzip.o
 lib-$(CONFIG_RPM2CPIO)                  += decompress_gunzip.o get_header_cpio.o
 lib-$(CONFIG_RPM)                       += open_transformer.o decompress_gunzip.o get_header_cpio.o
 lib-$(CONFIG_TAR)                       += get_header_tar.o
diff --git a/archival/libarchive/filter_accept_reject_list.c b/archival/libarchive/filter_accept_reject_list.c
index 39c811337..248374941 100644
--- a/archival/libarchive/filter_accept_reject_list.c
+++ b/archival/libarchive/filter_accept_reject_list.c
@@ -24,11 +24,13 @@ char FAST_FUNC filter_accept_reject_list(archive_handle_t *archive_handle)
         if (reject_entry) {
                 return EXIT_FAILURE;
         }
-        accept_entry = find_list_entry2(archive_handle->accept, key);
 
         /* Fail if an accept list was specified and the key wasnt in there */
-        if ((accept_entry == NULL) && archive_handle->accept) {
-                return EXIT_FAILURE;
+        if (archive_handle->accept) {
+                accept_entry = find_list_entry2(archive_handle->accept, key);
+                if (!accept_entry) {
+                        return EXIT_FAILURE;
+                }
         }
 
         /* Accepted */
diff --git a/archival/libarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
index 80a709144..bc09756ba 100644
--- a/archival/libarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -84,7 +84,7 @@ static unsigned long long getOctal(char *str, int len)
                 first >>= 1; /* now 7th bit = 6th bit */
                 v = first;   /* sign-extend 8 bits to 64 */
                 while (--len != 0)
-                        v = (v << 8) + (unsigned char) *str++;
+                        v = (v << 8) + (uint8_t) *++str;
         }
         return v;
 }
@@ -452,9 +452,11 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
                 if (cp)
                         *cp = '\0';
                 archive_handle->action_data(archive_handle);
-                if (archive_handle->accept || archive_handle->reject)
+                if (archive_handle->accept || archive_handle->reject
+                 || (archive_handle->ah_flags & ARCHIVE_REMEMBER_NAMES)
+                ) {
                         llist_add_to(&archive_handle->passed, file_header->name);
-                else /* Caller isn't interested in list of unpacked files */
+                } else /* Caller isn't interested in list of unpacked files */
                         free(file_header->name);
         } else {
                 data_skip(archive_handle);