diff options
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | archival/Kbuild.src | 2 | ||||
-rw-r--r-- | archival/ar.c | 2 | ||||
-rw-r--r-- | archival/bbunzip.c | 2 | ||||
-rw-r--r-- | archival/bzip2.c | 14 | ||||
-rw-r--r-- | archival/cpio.c | 2 | ||||
-rw-r--r-- | archival/dpkg.c | 2 | ||||
-rw-r--r-- | archival/dpkg_deb.c | 2 | ||||
-rw-r--r-- | archival/gzip.c | 2 | ||||
-rw-r--r-- | archival/libarchive/Kbuild.src (renamed from archival/libunarchive/Kbuild.src) | 0 | ||||
-rw-r--r-- | archival/libarchive/bz/LICENSE (renamed from archival/bz/LICENSE) | 0 | ||||
-rw-r--r-- | archival/libarchive/bz/README (renamed from archival/bz/README) | 0 | ||||
-rw-r--r-- | archival/libarchive/bz/blocksort.c (renamed from archival/bz/blocksort.c) | 0 | ||||
-rw-r--r-- | archival/libarchive/bz/bzlib.c (renamed from archival/bz/bzlib.c) | 0 | ||||
-rw-r--r-- | archival/libarchive/bz/bzlib.h (renamed from archival/bz/bzlib.h) | 0 | ||||
-rw-r--r-- | archival/libarchive/bz/bzlib_private.h (renamed from archival/bz/bzlib_private.h) | 0 | ||||
-rw-r--r-- | archival/libarchive/bz/compress.c (renamed from archival/bz/compress.c) | 0 | ||||
-rw-r--r-- | archival/libarchive/bz/huffman.c (renamed from archival/bz/huffman.c) | 0 | ||||
-rw-r--r-- | archival/libarchive/data_align.c (renamed from archival/libunarchive/data_align.c) | 2 | ||||
-rw-r--r-- | archival/libarchive/data_extract_all.c (renamed from archival/libunarchive/data_extract_all.c) | 2 | ||||
-rw-r--r-- | archival/libarchive/data_extract_to_command.c (renamed from archival/libunarchive/data_extract_to_command.c) | 2 | ||||
-rw-r--r-- | archival/libarchive/data_extract_to_stdout.c (renamed from archival/libunarchive/data_extract_to_stdout.c) | 2 | ||||
-rw-r--r-- | archival/libarchive/data_skip.c (renamed from archival/libunarchive/data_skip.c) | 2 | ||||
-rw-r--r-- | archival/libarchive/decompress_bunzip2.c (renamed from archival/libunarchive/decompress_bunzip2.c) | 2 | ||||
-rw-r--r-- | archival/libarchive/decompress_uncompress.c (renamed from archival/libunarchive/decompress_uncompress.c) | 2 | ||||
-rw-r--r-- | archival/libarchive/decompress_unlzma.c (renamed from archival/libunarchive/decompress_unlzma.c) | 2 | ||||
-rw-r--r-- | archival/libarchive/decompress_unxz.c (renamed from archival/libunarchive/decompress_unxz.c) | 2 | ||||
-rw-r--r-- | archival/libarchive/decompress_unzip.c (renamed from archival/libunarchive/decompress_unzip.c) | 2 | ||||
-rw-r--r-- | archival/libarchive/filter_accept_all.c (renamed from archival/libunarchive/filter_accept_all.c) | 2 | ||||
-rw-r--r-- | archival/libarchive/filter_accept_list.c (renamed from archival/libunarchive/filter_accept_list.c) | 2 | ||||
-rw-r--r-- | archival/libarchive/filter_accept_list_reassign.c (renamed from archival/libunarchive/filter_accept_list_reassign.c) | 2 | ||||
-rw-r--r-- | archival/libarchive/filter_accept_reject_list.c (renamed from archival/libunarchive/filter_accept_reject_list.c) | 2 | ||||
-rw-r--r-- | archival/libarchive/find_list_entry.c (renamed from archival/libunarchive/find_list_entry.c) | 2 | ||||
-rw-r--r-- | archival/libarchive/get_header_ar.c (renamed from archival/libunarchive/get_header_ar.c) | 2 | ||||
-rw-r--r-- | archival/libarchive/get_header_cpio.c (renamed from archival/libunarchive/get_header_cpio.c) | 2 | ||||
-rw-r--r-- | archival/libarchive/get_header_tar.c (renamed from archival/libunarchive/get_header_tar.c) | 2 | ||||
-rw-r--r-- | archival/libarchive/get_header_tar_bz2.c (renamed from archival/libunarchive/get_header_tar_bz2.c) | 2 | ||||
-rw-r--r-- | archival/libarchive/get_header_tar_gz.c (renamed from archival/libunarchive/get_header_tar_gz.c) | 2 | ||||
-rw-r--r-- | archival/libarchive/get_header_tar_lzma.c (renamed from archival/libunarchive/get_header_tar_lzma.c) | 2 | ||||
-rw-r--r-- | archival/libarchive/header_list.c (renamed from archival/libunarchive/header_list.c) | 2 | ||||
-rw-r--r-- | archival/libarchive/header_skip.c (renamed from archival/libunarchive/header_skip.c) | 2 | ||||
-rw-r--r-- | archival/libarchive/header_verbose_list.c (renamed from archival/libunarchive/header_verbose_list.c) | 2 | ||||
-rw-r--r-- | archival/libarchive/init_handle.c (renamed from archival/libunarchive/init_handle.c) | 2 | ||||
-rw-r--r-- | archival/libarchive/liblzo.h (renamed from archival/libunarchive/liblzo.h) | 0 | ||||
-rw-r--r-- | archival/libarchive/lzo1x_1.c (renamed from archival/libunarchive/lzo1x_1.c) | 0 | ||||
-rw-r--r-- | archival/libarchive/lzo1x_1o.c (renamed from archival/libunarchive/lzo1x_1o.c) | 0 | ||||
-rw-r--r-- | archival/libarchive/lzo1x_9x.c (renamed from archival/libunarchive/lzo1x_9x.c) | 0 | ||||
-rw-r--r-- | archival/libarchive/lzo1x_c.c (renamed from archival/libunarchive/lzo1x_c.c) | 0 | ||||
-rw-r--r-- | archival/libarchive/lzo1x_d.c (renamed from archival/libunarchive/lzo1x_d.c) | 0 | ||||
-rw-r--r-- | archival/libarchive/open_transformer.c (renamed from archival/libunarchive/open_transformer.c) | 4 | ||||
-rw-r--r-- | archival/libarchive/seek_by_jump.c (renamed from archival/libunarchive/seek_by_jump.c) | 2 | ||||
-rw-r--r-- | archival/libarchive/seek_by_read.c (renamed from archival/libunarchive/seek_by_read.c) | 2 | ||||
-rw-r--r-- | archival/libarchive/unpack_ar_archive.c (renamed from archival/libunarchive/unpack_ar_archive.c) | 2 | ||||
-rw-r--r-- | archival/libarchive/unxz/README (renamed from archival/libunarchive/unxz/README) | 0 | ||||
-rw-r--r-- | archival/libarchive/unxz/xz.h (renamed from archival/libunarchive/unxz/xz.h) | 0 | ||||
-rw-r--r-- | archival/libarchive/unxz/xz_config.h (renamed from archival/libunarchive/unxz/xz_config.h) | 0 | ||||
-rw-r--r-- | archival/libarchive/unxz/xz_dec_bcj.c (renamed from archival/libunarchive/unxz/xz_dec_bcj.c) | 0 | ||||
-rw-r--r-- | archival/libarchive/unxz/xz_dec_lzma2.c (renamed from archival/libunarchive/unxz/xz_dec_lzma2.c) | 0 | ||||
-rw-r--r-- | archival/libarchive/unxz/xz_dec_stream.c (renamed from archival/libunarchive/unxz/xz_dec_stream.c) | 0 | ||||
-rw-r--r-- | archival/libarchive/unxz/xz_lzma2.h (renamed from archival/libunarchive/unxz/xz_lzma2.h) | 0 | ||||
-rw-r--r-- | archival/libarchive/unxz/xz_private.h (renamed from archival/libunarchive/unxz/xz_private.h) | 0 | ||||
-rw-r--r-- | archival/libarchive/unxz/xz_stream.h (renamed from archival/libunarchive/unxz/xz_stream.h) | 0 | ||||
-rw-r--r-- | archival/lzop.c | 2 | ||||
-rw-r--r-- | archival/rpm.c | 2 | ||||
-rw-r--r-- | archival/rpm2cpio.c | 2 | ||||
-rw-r--r-- | archival/tar.c | 2 | ||||
-rw-r--r-- | archival/unzip.c | 2 | ||||
-rw-r--r-- | docs/keep_data_small.txt | 2 | ||||
-rw-r--r-- | include/archive.h (renamed from include/unarchive.h) | 0 | ||||
-rw-r--r-- | libbb/appletlib.c | 2 | ||||
-rw-r--r-- | libbb/read_printf.c | 2 | ||||
-rw-r--r-- | miscutils/bbconfig.c | 2 | ||||
-rw-r--r-- | procps/smemcap.c | 2 | ||||
-rw-r--r-- | scripts/Makefile.IMA | 4 |
74 files changed, 57 insertions, 57 deletions
@@ -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 e49d385..3466452 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 730d7c6..a2e3306 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 6b64576..a69e1b3 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 fdb8b93..a6abc93 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 a2d74dc..6ab2688 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 53e30d5..c37ae33 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 0ce7c02..aee7b4c 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 80141f3..38c5ae7 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 b0bc4e5..b0bc4e5 100644 --- a/archival/libunarchive/Kbuild.src +++ b/archival/libarchive/Kbuild.src diff --git a/archival/bz/LICENSE b/archival/libarchive/bz/LICENSE index da43465..da43465 100644 --- a/archival/bz/LICENSE +++ b/archival/libarchive/bz/LICENSE diff --git a/archival/bz/README b/archival/libarchive/bz/README index fffd47b..fffd47b 100644 --- a/archival/bz/README +++ b/archival/libarchive/bz/README diff --git a/archival/bz/blocksort.c b/archival/libarchive/bz/blocksort.c index f70c370..f70c370 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 b3beeab..b3beeab 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 1bb811c..1bb811c 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 6430ce4..6430ce4 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 6f1c70a..6f1c70a 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 676b1af..676b1af 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 4e21a36..2e56fa8 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 5fb1ab2..1b25c8b 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 b54f7f2..2bbab76 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 ce0713a..91f3f35 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 06b7439..a055424 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 15f08a6..4e46e68 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 285b4ef..44d8942 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 1a3a8f8..a047143 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 ca42723..e90dfb0 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 cb8a3d7..a29eef8 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 cb1f506..e69deb6 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 fe4414c..a7640af 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 891f583..d80f716 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 89a5502..3e86cca 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 5c0c85f..5efd1af 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 6bfc6bc..df603b1 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 8cd1096..3d99b49 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 cf64872..78b0ae2 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 4ffc170..60d3206 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 a9af22e..b09f869 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 9876b38..da08e0c 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 902d6eb..c4fc75f 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 2af36ac..2bfc525 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 d863e6a..bc4e415 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 de7021f..6644ea1 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 843997c..843997c 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 a888398..a888398 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 3c61253..3c61253 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 4832051..4832051 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 cc86f74..cc86f74 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 348a855..348a855 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 ed6a556..26ae565 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 bda55e1..7c2c52a 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 25b3136..ad931a8 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 4f68ba3..18dbfd5 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 c5972f6..c5972f6 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 c6c071c..c6c071c 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 187e1cb..187e1cb 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 09162b5..09162b5 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 da71cb4..da71cb4 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 bdcbf1b..bdcbf1b 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 47f21af..47f21af 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 145649a..145649a 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 36f2a7c..36f2a7c 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 acb34fe..094e78c 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 7b316a5..380226f 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 70021d5..ce8cd2c 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 2176ad2..82caec7 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 204e349..5d62c08 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 01c0d3c..21d7326 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 ba6d323..ba6d323 100644 --- a/include/unarchive.h +++ b/include/archive.h diff --git a/libbb/appletlib.c b/libbb/appletlib.c index fab996c..d7c9288 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 7ca3d68..8664bc6 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 1cb42ed..7c30669 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 196c91f..200df67 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 11ae39e..a62618a 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))) |