From d184a728cf5c270f1653f60bc0b6b83290127121 Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Thu, 22 Sep 2011 12:45:14 +0200
Subject: rename archive.h to bb_archive.h. no code changes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 archival/ar.c                                     | 2 +-
 archival/bbunzip.c                                | 2 +-
 archival/bzip2.c                                  | 2 +-
 archival/cpio.c                                   | 2 +-
 archival/dpkg.c                                   | 2 +-
 archival/dpkg_deb.c                               | 2 +-
 archival/gzip.c                                   | 2 +-
 archival/libarchive/data_align.c                  | 2 +-
 archival/libarchive/data_extract_all.c            | 2 +-
 archival/libarchive/data_extract_to_command.c     | 2 +-
 archival/libarchive/data_extract_to_stdout.c      | 2 +-
 archival/libarchive/data_skip.c                   | 2 +-
 archival/libarchive/decompress_bunzip2.c          | 2 +-
 archival/libarchive/decompress_uncompress.c       | 2 +-
 archival/libarchive/decompress_unlzma.c           | 2 +-
 archival/libarchive/decompress_unxz.c             | 2 +-
 archival/libarchive/decompress_unzip.c            | 2 +-
 archival/libarchive/filter_accept_all.c           | 2 +-
 archival/libarchive/filter_accept_list.c          | 2 +-
 archival/libarchive/filter_accept_list_reassign.c | 2 +-
 archival/libarchive/filter_accept_reject_list.c   | 2 +-
 archival/libarchive/find_list_entry.c             | 2 +-
 archival/libarchive/get_header_ar.c               | 2 +-
 archival/libarchive/get_header_cpio.c             | 2 +-
 archival/libarchive/get_header_tar.c              | 2 +-
 archival/libarchive/get_header_tar_bz2.c          | 2 +-
 archival/libarchive/get_header_tar_gz.c           | 2 +-
 archival/libarchive/get_header_tar_lzma.c         | 2 +-
 archival/libarchive/header_list.c                 | 2 +-
 archival/libarchive/header_skip.c                 | 2 +-
 archival/libarchive/header_verbose_list.c         | 2 +-
 archival/libarchive/init_handle.c                 | 2 +-
 archival/libarchive/open_transformer.c            | 2 +-
 archival/libarchive/seek_by_jump.c                | 2 +-
 archival/libarchive/seek_by_read.c                | 2 +-
 archival/libarchive/unpack_ar_archive.c           | 2 +-
 archival/lzop.c                                   | 2 +-
 archival/rpm.c                                    | 2 +-
 archival/rpm2cpio.c                               | 2 +-
 archival/tar.c                                    | 2 +-
 archival/unzip.c                                  | 2 +-
 41 files changed, 41 insertions(+), 41 deletions(-)

(limited to 'archival')

diff --git a/archival/ar.c b/archival/ar.c
index acad20ff2..88236e878 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -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
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index bb1ec0e37..9c1a73780 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 "archive.h"
+#include "bb_archive.h"
 
 enum {
 	OPT_STDOUT     = 1 << 0,
diff --git a/archival/bzip2.c b/archival/bzip2.c
index 3dde970f1..0716fa89b 100644
--- a/archival/bzip2.c
+++ b/archival/bzip2.c
@@ -17,7 +17,7 @@
 //usage:     "\n	-f	Force"
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 #define CONFIG_BZIP2_FAST 1
 
diff --git a/archival/cpio.c b/archival/cpio.c
index 9674a046b..c2a5b8ab9 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -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]")
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 2a6a7b3bf..bf9e9992c 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -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.
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index 5d814d7ef..a04ec9407 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -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
diff --git a/archival/gzip.c b/archival/gzip.c
index 3af930b7e..929107389 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -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"
 
 
 /* ===========================================================================
diff --git a/archival/libarchive/data_align.c b/archival/libarchive/data_align.c
index 2e56fa8ff..a6b84a440 100644
--- a/archival/libarchive/data_align.c
+++ b/archival/libarchive/data_align.c
@@ -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)
 {
diff --git a/archival/libarchive/data_extract_all.c b/archival/libarchive/data_extract_all.c
index 1b25c8bd6..f565e5471 100644
--- a/archival/libarchive/data_extract_all.c
+++ b/archival/libarchive/data_extract_all.c
@@ -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)
 {
diff --git a/archival/libarchive/data_extract_to_command.c b/archival/libarchive/data_extract_to_command.c
index 0e977049d..cc2ff7798 100644
--- a/archival/libarchive/data_extract_to_command.c
+++ b/archival/libarchive/data_extract_to_command.c
@@ -4,7 +4,7 @@
  */
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 enum {
 	//TAR_FILETYPE,
diff --git a/archival/libarchive/data_extract_to_stdout.c b/archival/libarchive/data_extract_to_stdout.c
index 91f3f3539..f849f3b42 100644
--- a/archival/libarchive/data_extract_to_stdout.c
+++ b/archival/libarchive/data_extract_to_stdout.c
@@ -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)
 {
diff --git a/archival/libarchive/data_skip.c b/archival/libarchive/data_skip.c
index a055424e2..588167f01 100644
--- a/archival/libarchive/data_skip.c
+++ b/archival/libarchive/data_skip.c
@@ -4,7 +4,7 @@
  */
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 void FAST_FUNC data_skip(archive_handle_t *archive_handle)
 {
diff --git a/archival/libarchive/decompress_bunzip2.c b/archival/libarchive/decompress_bunzip2.c
index 4e46e6849..cd3144743 100644
--- a/archival/libarchive/decompress_bunzip2.c
+++ b/archival/libarchive/decompress_bunzip2.c
@@ -40,7 +40,7 @@
  */
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 /* Constants for Huffman coding */
 #define MAX_GROUPS          6
diff --git a/archival/libarchive/decompress_uncompress.c b/archival/libarchive/decompress_uncompress.c
index d1061a2bb..c6040d04b 100644
--- a/archival/libarchive/decompress_uncompress.c
+++ b/archival/libarchive/decompress_uncompress.c
@@ -25,7 +25,7 @@
  */
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 
 /* Default input buffer size */
diff --git a/archival/libarchive/decompress_unlzma.c b/archival/libarchive/decompress_unlzma.c
index a04714341..3631b50cc 100644
--- a/archival/libarchive/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 "archive.h"
+#include "bb_archive.h"
 
 #if ENABLE_FEATURE_LZMA_FAST
 #  define speed_inline ALWAYS_INLINE
diff --git a/archival/libarchive/decompress_unxz.c b/archival/libarchive/decompress_unxz.c
index e90dfb06f..3e5d4edca 100644
--- a/archival/libarchive/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 "archive.h"
+#include "bb_archive.h"
 
 #define XZ_FUNC FAST_FUNC
 #define XZ_EXTERN static
diff --git a/archival/libarchive/decompress_unzip.c b/archival/libarchive/decompress_unzip.c
index a29eef837..aa5d22d0a 100644
--- a/archival/libarchive/decompress_unzip.c
+++ b/archival/libarchive/decompress_unzip.c
@@ -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 */
diff --git a/archival/libarchive/filter_accept_all.c b/archival/libarchive/filter_accept_all.c
index e69deb679..c33f7d3e3 100644
--- a/archival/libarchive/filter_accept_all.c
+++ b/archival/libarchive/filter_accept_all.c
@@ -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)
diff --git a/archival/libarchive/filter_accept_list.c b/archival/libarchive/filter_accept_list.c
index a7640af79..a2d4b23e9 100644
--- a/archival/libarchive/filter_accept_list.c
+++ b/archival/libarchive/filter_accept_list.c
@@ -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.
diff --git a/archival/libarchive/filter_accept_list_reassign.c b/archival/libarchive/filter_accept_list_reassign.c
index d80f71668..3d19abe44 100644
--- a/archival/libarchive/filter_accept_list_reassign.c
+++ b/archival/libarchive/filter_accept_list_reassign.c
@@ -6,7 +6,7 @@
  */
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 /* Built and used only if ENABLE_DPKG || ENABLE_DPKG_DEB */
 
diff --git a/archival/libarchive/filter_accept_reject_list.c b/archival/libarchive/filter_accept_reject_list.c
index 3e86cca65..39c811337 100644
--- a/archival/libarchive/filter_accept_reject_list.c
+++ b/archival/libarchive/filter_accept_reject_list.c
@@ -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
diff --git a/archival/libarchive/find_list_entry.c b/archival/libarchive/find_list_entry.c
index 5efd1af2e..56032c65a 100644
--- a/archival/libarchive/find_list_entry.c
+++ b/archival/libarchive/find_list_entry.c
@@ -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)
diff --git a/archival/libarchive/get_header_ar.c b/archival/libarchive/get_header_ar.c
index df603b111..23c412496 100644
--- a/archival/libarchive/get_header_ar.c
+++ b/archival/libarchive/get_header_ar.c
@@ -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)
diff --git a/archival/libarchive/get_header_cpio.c b/archival/libarchive/get_header_cpio.c
index 3d99b492a..1a0058b63 100644
--- a/archival/libarchive/get_header_cpio.c
+++ b/archival/libarchive/get_header_cpio.c
@@ -5,7 +5,7 @@
  */
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 typedef struct hardlinks_t {
 	struct hardlinks_t *next;
diff --git a/archival/libarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
index 79caff55a..41e3efb50 100644
--- a/archival/libarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -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;
diff --git a/archival/libarchive/get_header_tar_bz2.c b/archival/libarchive/get_header_tar_bz2.c
index 60d32069f..e012dec3b 100644
--- a/archival/libarchive/get_header_tar_bz2.c
+++ b/archival/libarchive/get_header_tar_bz2.c
@@ -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)
 {
diff --git a/archival/libarchive/get_header_tar_gz.c b/archival/libarchive/get_header_tar_gz.c
index 889fed0d9..b9679b0bd 100644
--- a/archival/libarchive/get_header_tar_gz.c
+++ b/archival/libarchive/get_header_tar_gz.c
@@ -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)
 {
diff --git a/archival/libarchive/get_header_tar_lzma.c b/archival/libarchive/get_header_tar_lzma.c
index da08e0c72..666700729 100644
--- a/archival/libarchive/get_header_tar_lzma.c
+++ b/archival/libarchive/get_header_tar_lzma.c
@@ -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)
 {
diff --git a/archival/libarchive/header_list.c b/archival/libarchive/header_list.c
index c4fc75f38..0621aa406 100644
--- a/archival/libarchive/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 "archive.h"
+#include "bb_archive.h"
 
 void FAST_FUNC header_list(const file_header_t *file_header)
 {
diff --git a/archival/libarchive/header_skip.c b/archival/libarchive/header_skip.c
index 2bfc5253c..f5987bfe2 100644
--- a/archival/libarchive/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 "archive.h"
+#include "bb_archive.h"
 
 void FAST_FUNC header_skip(const file_header_t *file_header UNUSED_PARAM)
 {
diff --git a/archival/libarchive/header_verbose_list.c b/archival/libarchive/header_verbose_list.c
index bc4e4154b..87dd82136 100644
--- a/archival/libarchive/header_verbose_list.c
+++ b/archival/libarchive/header_verbose_list.c
@@ -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)
 {
diff --git a/archival/libarchive/init_handle.c b/archival/libarchive/init_handle.c
index 6644ea13b..cbae06ac3 100644
--- a/archival/libarchive/init_handle.c
+++ b/archival/libarchive/init_handle.c
@@ -4,7 +4,7 @@
  */
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 archive_handle_t* FAST_FUNC init_handle(void)
 {
diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c
index 26ae565f5..aa8c1021c 100644
--- a/archival/libarchive/open_transformer.c
+++ b/archival/libarchive/open_transformer.c
@@ -4,7 +4,7 @@
  */
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 /* transformer(), more than meets the eye */
 /*
diff --git a/archival/libarchive/seek_by_jump.c b/archival/libarchive/seek_by_jump.c
index 7c2c52ae1..4fcd99ac8 100644
--- a/archival/libarchive/seek_by_jump.c
+++ b/archival/libarchive/seek_by_jump.c
@@ -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)
 {
diff --git a/archival/libarchive/seek_by_read.c b/archival/libarchive/seek_by_read.c
index ad931a8de..c0fde9660 100644
--- a/archival/libarchive/seek_by_read.c
+++ b/archival/libarchive/seek_by_read.c
@@ -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.
diff --git a/archival/libarchive/unpack_ar_archive.c b/archival/libarchive/unpack_ar_archive.c
index 18dbfd54d..214d17e23 100644
--- a/archival/libarchive/unpack_ar_archive.c
+++ b/archival/libarchive/unpack_ar_archive.c
@@ -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)
diff --git a/archival/lzop.c b/archival/lzop.c
index 1326bd790..7e30091d9 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -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 */
diff --git a/archival/rpm.c b/archival/rpm.c
index 8174f4869..089b68983 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -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
diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index ff4a0d1b0..28b43a181 100644
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -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 };
diff --git a/archival/tar.c b/archival/tar.c
index 375e838d2..766b79b2b 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -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
diff --git a/archival/unzip.c b/archival/unzip.c
index 4cc98cdb2..3a11f78a5 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -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
-- 
cgit v1.2.3