rename archival/libunarchive -> archival/libarchive; move bz/ into it

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

74 files changed, 57 insertions, 57 deletions

diff --git a/Makefile b/Makefile
index c41643d8b..8fac9e9f9 100644
--- a/Makefile
+++ b/Makefile
@@ -464,7 +464,7 @@ core-y		:= \
 
 libs-y		:= \
 		archival/ \
-		archival/libunarchive/ \
+		archival/libarchive/ \
 		console-tools/ \
 		coreutils/ \
 		coreutils/libcoreutils/ \
diff --git a/archival/Kbuild.src b/archival/Kbuild.src
index e49d38538..3466452f7 100644
--- a/archival/Kbuild.src
+++ b/archival/Kbuild.src
@@ -4,7 +4,7 @@
 #
 # Licensed under GPLv2, see file LICENSE in this source tree.
 
-libs-y				+= libunarchive/
+libs-y				+= libarchive/
 
 lib-y:=
 
diff --git a/archival/ar.c b/archival/ar.c
index 730d7c6c6..a2e3306ac 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -18,7 +18,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 #include "ar.h"
 
 #if ENABLE_FEATURE_AR_CREATE
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 6b6457673..a69e1b3ca 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -5,7 +5,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 enum {
 	OPT_STDOUT     = 1 << 0,
diff --git a/archival/bzip2.c b/archival/bzip2.c
index fdb8b9306..a6abc931c 100644
--- a/archival/bzip2.c
+++ b/archival/bzip2.c
@@ -8,7 +8,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 #define CONFIG_BZIP2_FEATURE_SPEED 1
 
@@ -33,14 +33,14 @@
 /* Takes ~300 bytes, detects corruption caused by bad RAM etc */
 #define BZ_LIGHT_DEBUG 0
 
-#include "bz/bzlib.h"
+#include "libarchive/bz/bzlib.h"
 
-#include "bz/bzlib_private.h"
+#include "libarchive/bz/bzlib_private.h"
 
-#include "bz/blocksort.c"
-#include "bz/bzlib.c"
-#include "bz/compress.c"
-#include "bz/huffman.c"
+#include "libarchive/bz/blocksort.c"
+#include "libarchive/bz/bzlib.c"
+#include "libarchive/bz/compress.c"
+#include "libarchive/bz/huffman.c"
 
 /* No point in being shy and having very small buffer here.
  * bzip2 internal buffers are much bigger anyway, hundreds of kbytes.
diff --git a/archival/cpio.c b/archival/cpio.c
index a2d74dc79..6ab268821 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -12,7 +12,7 @@
  *
  */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 /* GNU cpio 2.9 --help (abridged):
 
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 53e30d541..c37ae3349 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -30,7 +30,7 @@
 
 #include "libbb.h"
 #include <fnmatch.h>
-#include "unarchive.h"
+#include "archive.h"
 
 /* note: if you vary hash_prime sizes be aware,
  * 1) tweaking these will have a big effect on how much memory this program uses.
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index 0ce7c02d8..aee7b4cf5 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -5,7 +5,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 #define DPKG_DEB_OPT_CONTENTS         1
 #define DPKG_DEB_OPT_CONTROL          2
diff --git a/archival/gzip.c b/archival/gzip.c
index 80141f380..38c5ae7fd 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -40,7 +40,7 @@ aa:      85.1% -- replaced with aa.gz
 */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 
 /* ===========================================================================
diff --git a/archival/libunarchive/Kbuild.src b/archival/libarchive/Kbuild.src
index b0bc4e5aa..b0bc4e5aa 100644
--- a/archival/libunarchive/Kbuild.src
+++ b/archival/libarchive/Kbuild.src
diff --git a/archival/bz/LICENSE b/archival/libarchive/bz/LICENSE
index da4346520..da4346520 100644
--- a/archival/bz/LICENSE
+++ b/archival/libarchive/bz/LICENSE
diff --git a/archival/bz/README b/archival/libarchive/bz/README
index fffd47b8a..fffd47b8a 100644
--- a/archival/bz/README
+++ b/archival/libarchive/bz/README
diff --git a/archival/bz/blocksort.c b/archival/libarchive/bz/blocksort.c
index f70c3701d..f70c3701d 100644
--- a/archival/bz/blocksort.c
+++ b/archival/libarchive/bz/blocksort.c
diff --git a/archival/bz/bzlib.c b/archival/libarchive/bz/bzlib.c
index b3beeabed..b3beeabed 100644
--- a/archival/bz/bzlib.c
+++ b/archival/libarchive/bz/bzlib.c
diff --git a/archival/bz/bzlib.h b/archival/libarchive/bz/bzlib.h
index 1bb811c4a..1bb811c4a 100644
--- a/archival/bz/bzlib.h
+++ b/archival/libarchive/bz/bzlib.h
diff --git a/archival/bz/bzlib_private.h b/archival/libarchive/bz/bzlib_private.h
index 6430ce407..6430ce407 100644
--- a/archival/bz/bzlib_private.h
+++ b/archival/libarchive/bz/bzlib_private.h
diff --git a/archival/bz/compress.c b/archival/libarchive/bz/compress.c
index 6f1c70a08..6f1c70a08 100644
--- a/archival/bz/compress.c
+++ b/archival/libarchive/bz/compress.c
diff --git a/archival/bz/huffman.c b/archival/libarchive/bz/huffman.c
index 676b1af66..676b1af66 100644
--- a/archival/bz/huffman.c
+++ b/archival/libarchive/bz/huffman.c
diff --git a/archival/libunarchive/data_align.c b/archival/libarchive/data_align.c
index 4e21a36b3..2e56fa8ff 100644
--- a/archival/libunarchive/data_align.c
+++ b/archival/libarchive/data_align.c
@@ -4,7 +4,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 void FAST_FUNC data_align(archive_handle_t *archive_handle, unsigned boundary)
 {
diff --git a/archival/libunarchive/data_extract_all.c b/archival/libarchive/data_extract_all.c
index 5fb1ab2ae..1b25c8bd6 100644
--- a/archival/libunarchive/data_extract_all.c
+++ b/archival/libarchive/data_extract_all.c
@@ -4,7 +4,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
 {
diff --git a/archival/libunarchive/data_extract_to_command.c b/archival/libarchive/data_extract_to_command.c
index b54f7f215..2bbab7641 100644
--- a/archival/libunarchive/data_extract_to_command.c
+++ b/archival/libarchive/data_extract_to_command.c
@@ -4,7 +4,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 enum {
 	//TAR_FILETYPE,
diff --git a/archival/libunarchive/data_extract_to_stdout.c b/archival/libarchive/data_extract_to_stdout.c
index ce0713ac4..91f3f3539 100644
--- a/archival/libunarchive/data_extract_to_stdout.c
+++ b/archival/libarchive/data_extract_to_stdout.c
@@ -4,7 +4,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 void FAST_FUNC data_extract_to_stdout(archive_handle_t *archive_handle)
 {
diff --git a/archival/libunarchive/data_skip.c b/archival/libarchive/data_skip.c
index 06b74399d..a055424e2 100644
--- a/archival/libunarchive/data_skip.c
+++ b/archival/libarchive/data_skip.c
@@ -4,7 +4,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 void FAST_FUNC data_skip(archive_handle_t *archive_handle)
 {
diff --git a/archival/libunarchive/decompress_bunzip2.c b/archival/libarchive/decompress_bunzip2.c
index 15f08a60e..4e46e6849 100644
--- a/archival/libunarchive/decompress_bunzip2.c
+++ b/archival/libarchive/decompress_bunzip2.c
@@ -40,7 +40,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 /* Constants for Huffman coding */
 #define MAX_GROUPS          6
diff --git a/archival/libunarchive/decompress_uncompress.c b/archival/libarchive/decompress_uncompress.c
index 285b4efeb..44d894244 100644
--- a/archival/libunarchive/decompress_uncompress.c
+++ b/archival/libarchive/decompress_uncompress.c
@@ -25,7 +25,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 
 /* Default input buffer size */
diff --git a/archival/libunarchive/decompress_unlzma.c b/archival/libarchive/decompress_unlzma.c
index 1a3a8f86b..a04714341 100644
--- a/archival/libunarchive/decompress_unlzma.c
+++ b/archival/libarchive/decompress_unlzma.c
@@ -9,7 +9,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 #if ENABLE_FEATURE_LZMA_FAST
 #  define speed_inline ALWAYS_INLINE
diff --git a/archival/libunarchive/decompress_unxz.c b/archival/libarchive/decompress_unxz.c
index ca427231e..e90dfb06f 100644
--- a/archival/libunarchive/decompress_unxz.c
+++ b/archival/libarchive/decompress_unxz.c
@@ -10,7 +10,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 #define XZ_FUNC FAST_FUNC
 #define XZ_EXTERN static
diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libarchive/decompress_unzip.c
index cb8a3d737..a29eef837 100644
--- a/archival/libunarchive/decompress_unzip.c
+++ b/archival/libarchive/decompress_unzip.c
@@ -35,7 +35,7 @@
 
 #include <setjmp.h>
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 typedef struct huft_t {
 	unsigned char e;	/* number of extra bits or operation */
diff --git a/archival/libunarchive/filter_accept_all.c b/archival/libarchive/filter_accept_all.c
index cb1f506c8..e69deb679 100644
--- a/archival/libunarchive/filter_accept_all.c
+++ b/archival/libarchive/filter_accept_all.c
@@ -6,7 +6,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 /* Accept any non-null name, its not really a filter at all */
 char FAST_FUNC filter_accept_all(archive_handle_t *archive_handle)
diff --git a/archival/libunarchive/filter_accept_list.c b/archival/libarchive/filter_accept_list.c
index fe4414c85..a7640af79 100644
--- a/archival/libunarchive/filter_accept_list.c
+++ b/archival/libarchive/filter_accept_list.c
@@ -6,7 +6,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 /*
  * Accept names that are in the accept list, ignoring reject list.
diff --git a/archival/libunarchive/filter_accept_list_reassign.c b/archival/libarchive/filter_accept_list_reassign.c
index 891f58390..d80f71668 100644
--- a/archival/libunarchive/filter_accept_list_reassign.c
+++ b/archival/libarchive/filter_accept_list_reassign.c
@@ -6,7 +6,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 /* Built and used only if ENABLE_DPKG || ENABLE_DPKG_DEB */
 
diff --git a/archival/libunarchive/filter_accept_reject_list.c b/archival/libarchive/filter_accept_reject_list.c
index 89a5502d5..3e86cca65 100644
--- a/archival/libunarchive/filter_accept_reject_list.c
+++ b/archival/libarchive/filter_accept_reject_list.c
@@ -6,7 +6,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 /*
  * Accept names that are in the accept list and not in the reject list
diff --git a/archival/libunarchive/find_list_entry.c b/archival/libarchive/find_list_entry.c
index 5c0c85f09..5efd1af2e 100644
--- a/archival/libunarchive/find_list_entry.c
+++ b/archival/libarchive/find_list_entry.c
@@ -7,7 +7,7 @@
 
 #include <fnmatch.h>
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 /* Find a string in a shell pattern list */
 const llist_t* FAST_FUNC find_list_entry(const llist_t *list, const char *filename)
diff --git a/archival/libunarchive/get_header_ar.c b/archival/libarchive/get_header_ar.c
index 6bfc6bc27..df603b111 100644
--- a/archival/libunarchive/get_header_ar.c
+++ b/archival/libarchive/get_header_ar.c
@@ -5,7 +5,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 #include "ar.h"
 
 static unsigned read_num(const char *str, int base)
diff --git a/archival/libunarchive/get_header_cpio.c b/archival/libarchive/get_header_cpio.c
index 8cd1096ba..3d99b492a 100644
--- a/archival/libunarchive/get_header_cpio.c
+++ b/archival/libarchive/get_header_cpio.c
@@ -5,7 +5,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 typedef struct hardlinks_t {
 	struct hardlinks_t *next;
diff --git a/archival/libunarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
index cf6487207..78b0ae25f 100644
--- a/archival/libunarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -12,7 +12,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 typedef uint32_t aliased_uint32_t FIX_ALIASING;
 typedef off_t    aliased_off_t    FIX_ALIASING;
diff --git a/archival/libunarchive/get_header_tar_bz2.c b/archival/libarchive/get_header_tar_bz2.c
index 4ffc17086..60d32069f 100644
--- a/archival/libunarchive/get_header_tar_bz2.c
+++ b/archival/libarchive/get_header_tar_bz2.c
@@ -4,7 +4,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 char FAST_FUNC get_header_tar_bz2(archive_handle_t *archive_handle)
 {
diff --git a/archival/libunarchive/get_header_tar_gz.c b/archival/libarchive/get_header_tar_gz.c
index a9af22e0e..b09f8691c 100644
--- a/archival/libunarchive/get_header_tar_gz.c
+++ b/archival/libarchive/get_header_tar_gz.c
@@ -4,7 +4,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 char FAST_FUNC get_header_tar_gz(archive_handle_t *archive_handle)
 {
diff --git a/archival/libunarchive/get_header_tar_lzma.c b/archival/libarchive/get_header_tar_lzma.c
index 9876b3827..da08e0c72 100644
--- a/archival/libunarchive/get_header_tar_lzma.c
+++ b/archival/libarchive/get_header_tar_lzma.c
@@ -7,7 +7,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 char FAST_FUNC get_header_tar_lzma(archive_handle_t *archive_handle)
 {
diff --git a/archival/libunarchive/header_list.c b/archival/libarchive/header_list.c
index 902d6ebe0..c4fc75f38 100644
--- a/archival/libunarchive/header_list.c
+++ b/archival/libarchive/header_list.c
@@ -3,7 +3,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 void FAST_FUNC header_list(const file_header_t *file_header)
 {
diff --git a/archival/libunarchive/header_skip.c b/archival/libarchive/header_skip.c
index 2af36ac9c..2bfc5253c 100644
--- a/archival/libunarchive/header_skip.c
+++ b/archival/libarchive/header_skip.c
@@ -3,7 +3,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 void FAST_FUNC header_skip(const file_header_t *file_header UNUSED_PARAM)
 {
diff --git a/archival/libunarchive/header_verbose_list.c b/archival/libarchive/header_verbose_list.c
index d863e6a29..bc4e4154b 100644
--- a/archival/libunarchive/header_verbose_list.c
+++ b/archival/libarchive/header_verbose_list.c
@@ -4,7 +4,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 void FAST_FUNC header_verbose_list(const file_header_t *file_header)
 {
diff --git a/archival/libunarchive/init_handle.c b/archival/libarchive/init_handle.c
index de7021f78..6644ea13b 100644
--- a/archival/libunarchive/init_handle.c
+++ b/archival/libarchive/init_handle.c
@@ -4,7 +4,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 archive_handle_t* FAST_FUNC init_handle(void)
 {
diff --git a/archival/libunarchive/liblzo.h b/archival/libarchive/liblzo.h
index 843997cb9..843997cb9 100644
--- a/archival/libunarchive/liblzo.h
+++ b/archival/libarchive/liblzo.h
diff --git a/archival/libunarchive/lzo1x_1.c b/archival/libarchive/lzo1x_1.c
index a88839846..a88839846 100644
--- a/archival/libunarchive/lzo1x_1.c
+++ b/archival/libarchive/lzo1x_1.c
diff --git a/archival/libunarchive/lzo1x_1o.c b/archival/libarchive/lzo1x_1o.c
index 3c61253e0..3c61253e0 100644
--- a/archival/libunarchive/lzo1x_1o.c
+++ b/archival/libarchive/lzo1x_1o.c
diff --git a/archival/libunarchive/lzo1x_9x.c b/archival/libarchive/lzo1x_9x.c
index 483205155..483205155 100644
--- a/archival/libunarchive/lzo1x_9x.c
+++ b/archival/libarchive/lzo1x_9x.c
diff --git a/archival/libunarchive/lzo1x_c.c b/archival/libarchive/lzo1x_c.c
index cc86f74b1..cc86f74b1 100644
--- a/archival/libunarchive/lzo1x_c.c
+++ b/archival/libarchive/lzo1x_c.c
diff --git a/archival/libunarchive/lzo1x_d.c b/archival/libarchive/lzo1x_d.c
index 348a85510..348a85510 100644
--- a/archival/libunarchive/lzo1x_d.c
+++ b/archival/libarchive/lzo1x_d.c
diff --git a/archival/libunarchive/open_transformer.c b/archival/libarchive/open_transformer.c
index ed6a556bb..26ae565f5 100644
--- a/archival/libunarchive/open_transformer.c
+++ b/archival/libarchive/open_transformer.c
@@ -4,12 +4,12 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 /* transformer(), more than meets the eye */
 /*
  * On MMU machine, the transform_prog is removed by macro magic
- * in include/unarchive.h. On NOMMU, transformer is removed.
+ * in include/archive.h. On NOMMU, transformer is removed.
  */
 void FAST_FUNC open_transformer(int fd,
 	IF_DESKTOP(long long) int FAST_FUNC (*transformer)(int src_fd, int dst_fd),
diff --git a/archival/libunarchive/seek_by_jump.c b/archival/libarchive/seek_by_jump.c
index bda55e1b1..7c2c52ae1 100644
--- a/archival/libunarchive/seek_by_jump.c
+++ b/archival/libarchive/seek_by_jump.c
@@ -4,7 +4,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 void FAST_FUNC seek_by_jump(int fd, off_t amount)
 {
diff --git a/archival/libunarchive/seek_by_read.c b/archival/libarchive/seek_by_read.c
index 25b31365d..ad931a8de 100644
--- a/archival/libunarchive/seek_by_read.c
+++ b/archival/libarchive/seek_by_read.c
@@ -4,7 +4,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 /*  If we are reading through a pipe, or from stdin then we can't lseek,
  *  we must read and discard the data to skip over it.
diff --git a/archival/libunarchive/unpack_ar_archive.c b/archival/libarchive/unpack_ar_archive.c
index 4f68ba3d8..18dbfd54d 100644
--- a/archival/libunarchive/unpack_ar_archive.c
+++ b/archival/libarchive/unpack_ar_archive.c
@@ -4,7 +4,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 #include "ar.h"
 
 void FAST_FUNC unpack_ar_archive(archive_handle_t *ar_archive)
diff --git a/archival/libunarchive/unxz/README b/archival/libarchive/unxz/README
index c5972f6b8..c5972f6b8 100644
--- a/archival/libunarchive/unxz/README
+++ b/archival/libarchive/unxz/README
diff --git a/archival/libunarchive/unxz/xz.h b/archival/libarchive/unxz/xz.h
index c6c071c4a..c6c071c4a 100644
--- a/archival/libunarchive/unxz/xz.h
+++ b/archival/libarchive/unxz/xz.h
diff --git a/archival/libunarchive/unxz/xz_config.h b/archival/libarchive/unxz/xz_config.h
index 187e1cbed..187e1cbed 100644
--- a/archival/libunarchive/unxz/xz_config.h
+++ b/archival/libarchive/unxz/xz_config.h
diff --git a/archival/libunarchive/unxz/xz_dec_bcj.c b/archival/libarchive/unxz/xz_dec_bcj.c
index 09162b51f..09162b51f 100644
--- a/archival/libunarchive/unxz/xz_dec_bcj.c
+++ b/archival/libarchive/unxz/xz_dec_bcj.c
diff --git a/archival/libunarchive/unxz/xz_dec_lzma2.c b/archival/libarchive/unxz/xz_dec_lzma2.c
index da71cb4d4..da71cb4d4 100644
--- a/archival/libunarchive/unxz/xz_dec_lzma2.c
+++ b/archival/libarchive/unxz/xz_dec_lzma2.c
diff --git a/archival/libunarchive/unxz/xz_dec_stream.c b/archival/libarchive/unxz/xz_dec_stream.c
index bdcbf1ba3..bdcbf1ba3 100644
--- a/archival/libunarchive/unxz/xz_dec_stream.c
+++ b/archival/libarchive/unxz/xz_dec_stream.c
diff --git a/archival/libunarchive/unxz/xz_lzma2.h b/archival/libarchive/unxz/xz_lzma2.h
index 47f21afbc..47f21afbc 100644
--- a/archival/libunarchive/unxz/xz_lzma2.h
+++ b/archival/libarchive/unxz/xz_lzma2.h
diff --git a/archival/libunarchive/unxz/xz_private.h b/archival/libarchive/unxz/xz_private.h
index 145649a83..145649a83 100644
--- a/archival/libunarchive/unxz/xz_private.h
+++ b/archival/libarchive/unxz/xz_private.h
diff --git a/archival/libunarchive/unxz/xz_stream.h b/archival/libarchive/unxz/xz_stream.h
index 36f2a7cbf..36f2a7cbf 100644
--- a/archival/libunarchive/unxz/xz_stream.h
+++ b/archival/libarchive/unxz/xz_stream.h
diff --git a/archival/lzop.c b/archival/lzop.c
index acb34fe14..094e78cf9 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -26,7 +26,7 @@
 */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 #include "liblzo_interface.h"
 
 /* lzo-2.03/src/lzo_ptr.h */
diff --git a/archival/rpm.c b/archival/rpm.c
index 7b316a5b8..380226f9b 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -8,7 +8,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 #include "rpm.h"
 
 #define RPM_CHAR_TYPE           1
diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index 70021d539..ce8cd2c2c 100644
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 #include "rpm.h"
 
 enum { rpm_fd = STDIN_FILENO };
diff --git a/archival/tar.c b/archival/tar.c
index 2176ad2ac..82caec770 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -25,7 +25,7 @@
 
 #include <fnmatch.h>
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 /* FIXME: Stop using this non-standard feature */
 #ifndef FNM_LEADING_DIR
 # define FNM_LEADING_DIR 0
diff --git a/archival/unzip.c b/archival/unzip.c
index 204e34952..5d62c08cb 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -20,7 +20,7 @@
  */
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 enum {
 #if BB_BIG_ENDIAN
diff --git a/docs/keep_data_small.txt b/docs/keep_data_small.txt
index 01c0d3c7b..21d732674 100644
--- a/docs/keep_data_small.txt
+++ b/docs/keep_data_small.txt
@@ -59,7 +59,7 @@ wait
 		Example 1
 
 One example how to reduce global data usage is in
-archival/libunarchive/decompress_unzip.c:
+archival/libarchive/decompress_unzip.c:
 
 /* This is somewhat complex-looking arrangement, but it allows
  * to place decompressor state either in bss or in
diff --git a/include/unarchive.h b/include/archive.h
index ba6d323e0..ba6d323e0 100644
--- a/include/unarchive.h
+++ b/include/archive.h
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index fab996ca0..d7c9288cb 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -66,7 +66,7 @@ static const char usage_messages[] ALIGN1 = UNPACKED_USAGE;
 #if ENABLE_FEATURE_COMPRESS_USAGE
 
 static const char packed_usage[] ALIGN1 = { PACKED_USAGE };
-# include "unarchive.h"
+# include "archive.h"
 static const char *unpack_usage_messages(void)
 {
 	char *outbuf = NULL;
diff --git a/libbb/read_printf.c b/libbb/read_printf.c
index 7ca3d68c3..8664bc625 100644
--- a/libbb/read_printf.c
+++ b/libbb/read_printf.c
@@ -15,7 +15,7 @@
 )
 
 #if ZIPPED
-# include "unarchive.h"
+# include "archive.h"
 #endif
 
 
diff --git a/miscutils/bbconfig.c b/miscutils/bbconfig.c
index 1cb42edeb..7c30669a3 100644
--- a/miscutils/bbconfig.c
+++ b/miscutils/bbconfig.c
@@ -4,7 +4,7 @@
 #include "libbb.h"
 #include "bbconfigopts.h"
 #if ENABLE_FEATURE_COMPRESS_BBCONFIG
-# include "unarchive.h"
+# include "archive.h"
 # include "bbconfigopts_bz2.h"
 #endif
 
diff --git a/procps/smemcap.c b/procps/smemcap.c
index 196c91f54..200df6795 100644
--- a/procps/smemcap.c
+++ b/procps/smemcap.c
@@ -20,7 +20,7 @@
 //config:	  a memory usage statistic tool.
 
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 struct fileblock {
 	struct fileblock *next;
diff --git a/scripts/Makefile.IMA b/scripts/Makefile.IMA
index 11ae39eae..a62618ae0 100644
--- a/scripts/Makefile.IMA
+++ b/scripts/Makefile.IMA
@@ -85,8 +85,8 @@ lib-y:=
 include archival/Kbuild
 lib-all-y += $(patsubst %,archival/%,$(sort $(lib-y)))
 lib-y:=
-include archival/libunarchive/Kbuild
-lib-all-y += $(patsubst %,archival/libunarchive/%,$(sort $(lib-y)))
+include archival/libarchive/Kbuild
+lib-all-y += $(patsubst %,archival/libarchive/%,$(sort $(lib-y)))
 lib-y:=
 include applets/Kbuild
 lib-all-y += $(patsubst %,applets/%,$(sort $(lib-y)))