archival/ar.c+1 -1
| @@ -28,7 +28,7 @@ |
| //usage: "\n -v Verbose" |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| #include "ar.h" |
| |
| #if ENABLE_FEATURE_AR_CREATE |
archival/bbunzip.c+1 -1
| @@ -5,7 +5,7 @@ |
| * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
| */ |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| enum { |
| OPT_STDOUT = 1 << 0, |
archival/bzip2.c+1 -1
| @@ -17,7 +17,7 @@ |
| //usage: "\n -f Force" |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| #define CONFIG_BZIP2_FAST 1 |
| |
archival/cpio.c+1 -1
| @@ -12,7 +12,7 @@ |
| * |
| */ |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| //usage:#define cpio_trivial_usage |
| //usage: "[-dmvu] [-F FILE]" IF_FEATURE_CPIO_O(" [-H newc]") |
archival/dpkg.c+1 -1
| @@ -57,7 +57,7 @@ |
| |
| #include "libbb.h" |
| #include <fnmatch.h> |
| - | #include "archive.h" |
| + | #include "bb_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. |
archival/dpkg_deb.c+1 -1
| @@ -19,7 +19,7 @@ |
| //usage: "$ dpkg-deb -X ./busybox_0.48-1_i386.deb /tmp\n" |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| #define DPKG_DEB_OPT_CONTENTS 1 |
| #define DPKG_DEB_OPT_CONTROL 2 |
archival/gzip.c+1 -1
| @@ -55,7 +55,7 @@ aa: 85.1% -- replaced with aa.gz |
| //usage: "-rw-rw-r-- 1 andersen andersen 554058 Apr 14 17:49 /tmp/busybox.tar.gz\n" |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| |
| /* =========================================================================== |
archival/libarchive/data_align.c+1 -1
| @@ -4,7 +4,7 @@ |
| */ |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| void FAST_FUNC data_align(archive_handle_t *archive_handle, unsigned boundary) |
| { |
archival/libarchive/data_extract_all.c+1 -1
| @@ -4,7 +4,7 @@ |
| */ |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| void FAST_FUNC data_extract_all(archive_handle_t *archive_handle) |
| { |
archival/libarchive/data_extract_to_command.c+1 -1
| @@ -4,7 +4,7 @@ |
| */ |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| enum { |
| //TAR_FILETYPE, |
archival/libarchive/data_extract_to_stdout.c+1 -1
| @@ -4,7 +4,7 @@ |
| */ |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| void FAST_FUNC data_extract_to_stdout(archive_handle_t *archive_handle) |
| { |
archival/libarchive/data_skip.c+1 -1
| @@ -4,7 +4,7 @@ |
| */ |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| void FAST_FUNC data_skip(archive_handle_t *archive_handle) |
| { |
archival/libarchive/decompress_bunzip2.c+1 -1
| @@ -40,7 +40,7 @@ |
| */ |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| /* Constants for Huffman coding */ |
| #define MAX_GROUPS 6 |
archival/libarchive/decompress_uncompress.c+1 -1
| @@ -25,7 +25,7 @@ |
| */ |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| |
| /* Default input buffer size */ |
archival/libarchive/decompress_unlzma.c+1 -1
| @@ -9,7 +9,7 @@ |
| * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
| */ |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| #if ENABLE_FEATURE_LZMA_FAST |
| # define speed_inline ALWAYS_INLINE |
archival/libarchive/decompress_unxz.c+1 -1
| @@ -10,7 +10,7 @@ |
| * Licensed under GPLv2, see file LICENSE in this source tree. |
| */ |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| #define XZ_FUNC FAST_FUNC |
| #define XZ_EXTERN static |
archival/libarchive/decompress_unzip.c+1 -1
| @@ -35,7 +35,7 @@ |
| |
| #include <setjmp.h> |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| typedef struct huft_t { |
| unsigned char e; /* number of extra bits or operation */ |
archival/libarchive/filter_accept_all.c+1 -1
| @@ -6,7 +6,7 @@ |
| */ |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_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) |
archival/libarchive/filter_accept_list.c+1 -1
| @@ -6,7 +6,7 @@ |
| */ |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| /* |
| * Accept names that are in the accept list, ignoring reject list. |
archival/libarchive/filter_accept_list_reassign.c+1 -1
| @@ -6,7 +6,7 @@ |
| */ |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| /* Built and used only if ENABLE_DPKG || ENABLE_DPKG_DEB */ |
| |
archival/libarchive/filter_accept_reject_list.c+1 -1
| @@ -6,7 +6,7 @@ |
| */ |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| /* |
| * Accept names that are in the accept list and not in the reject list |
archival/libarchive/find_list_entry.c+1 -1
| @@ -7,7 +7,7 @@ |
| |
| #include <fnmatch.h> |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_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) |
archival/libarchive/get_header_ar.c+1 -1
| @@ -5,7 +5,7 @@ |
| */ |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| #include "ar.h" |
| |
| static unsigned read_num(const char *str, int base) |
archival/libarchive/get_header_cpio.c+1 -1
| @@ -5,7 +5,7 @@ |
| */ |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| typedef struct hardlinks_t { |
| struct hardlinks_t *next; |
archival/libarchive/get_header_tar.c+1 -1
| @@ -12,7 +12,7 @@ |
| */ |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| typedef uint32_t aliased_uint32_t FIX_ALIASING; |
| typedef off_t aliased_off_t FIX_ALIASING; |
archival/libarchive/get_header_tar_bz2.c+1 -1
| @@ -4,7 +4,7 @@ |
| */ |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| char FAST_FUNC get_header_tar_bz2(archive_handle_t *archive_handle) |
| { |
archival/libarchive/get_header_tar_gz.c+1 -1
| @@ -4,7 +4,7 @@ |
| */ |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| char FAST_FUNC get_header_tar_gz(archive_handle_t *archive_handle) |
| { |
archival/libarchive/get_header_tar_lzma.c+1 -1
| @@ -7,7 +7,7 @@ |
| */ |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| char FAST_FUNC get_header_tar_lzma(archive_handle_t *archive_handle) |
| { |
archival/libarchive/header_list.c+1 -1
| @@ -3,7 +3,7 @@ |
| * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
| */ |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| void FAST_FUNC header_list(const file_header_t *file_header) |
| { |
archival/libarchive/header_skip.c+1 -1
| @@ -3,7 +3,7 @@ |
| * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
| */ |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| void FAST_FUNC header_skip(const file_header_t *file_header UNUSED_PARAM) |
| { |
archival/libarchive/header_verbose_list.c+1 -1
| @@ -4,7 +4,7 @@ |
| */ |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| void FAST_FUNC header_verbose_list(const file_header_t *file_header) |
| { |
archival/libarchive/init_handle.c+1 -1
| @@ -4,7 +4,7 @@ |
| */ |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| archive_handle_t* FAST_FUNC init_handle(void) |
| { |
archival/libarchive/open_transformer.c+1 -1
| @@ -4,7 +4,7 @@ |
| */ |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| /* transformer(), more than meets the eye */ |
| /* |
archival/libarchive/seek_by_jump.c+1 -1
| @@ -4,7 +4,7 @@ |
| */ |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| void FAST_FUNC seek_by_jump(int fd, off_t amount) |
| { |
archival/libarchive/seek_by_read.c+1 -1
| @@ -4,7 +4,7 @@ |
| */ |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_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. |
archival/libarchive/unpack_ar_archive.c+1 -1
| @@ -4,7 +4,7 @@ |
| */ |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| #include "ar.h" |
| |
| void FAST_FUNC unpack_ar_archive(archive_handle_t *ar_archive) |
archival/lzop.c+1 -1
| @@ -51,7 +51,7 @@ |
| //usage: "\n -F Don't store or verify checksum" |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| #include "liblzo_interface.h" |
| |
| /* lzo-2.03/src/lzo_ptr.h */ |
archival/rpm.c+1 -1
| @@ -20,7 +20,7 @@ |
| //usage: "\n -c List config files" |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| #include "rpm.h" |
| |
| #define RPM_CHAR_TYPE 1 |
archival/rpm2cpio.c+1 -1
| @@ -13,7 +13,7 @@ |
| //usage: "Output a cpio archive of the rpm file" |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| #include "rpm.h" |
| |
| enum { rpm_fd = STDIN_FILENO }; |
archival/tar.c+1 -1
| @@ -44,7 +44,7 @@ |
| |
| #include <fnmatch.h> |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| /* FIXME: Stop using this non-standard feature */ |
| #ifndef FNM_LEADING_DIR |
| # define FNM_LEADING_DIR 0 |
archival/unzip.c+1 -1
| @@ -32,7 +32,7 @@ |
| //usage: "\n -d DIR Extract files into DIR" |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| enum { |
| #if BB_BIG_ENDIAN |
libbb/appletlib.c+1 -1
| @@ -62,7 +62,7 @@ static const char usage_messages[] ALIGN1 = UNPACKED_USAGE; |
| #if ENABLE_FEATURE_COMPRESS_USAGE |
| |
| static const char packed_usage[] ALIGN1 = { PACKED_USAGE }; |
| - | # include "archive.h" |
| + | # include "bb_archive.h" |
| static const char *unpack_usage_messages(void) |
| { |
| char *outbuf = NULL; |
libbb/read_printf.c+1 -1
| @@ -15,7 +15,7 @@ |
| ) |
| |
| #if ZIPPED |
| - | # include "archive.h" |
| + | # include "bb_archive.h" |
| #endif |
| |
| |
miscutils/bbconfig.c+1 -1
| @@ -10,7 +10,7 @@ |
| #include "libbb.h" |
| #include "bbconfigopts.h" |
| #if ENABLE_FEATURE_COMPRESS_BBCONFIG |
| - | # include "archive.h" |
| + | # include "bb_archive.h" |
| # include "bbconfigopts_bz2.h" |
| #endif |
| |
procps/smemcap.c+1 -1
| @@ -20,7 +20,7 @@ |
| //config: a memory usage statistic tool. |
| |
| #include "libbb.h" |
| - | #include "archive.h" |
| + | #include "bb_archive.h" |
| |
| struct fileblock { |
| struct fileblock *next; |