aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2011-09-22 12:45:14 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2011-09-22 12:45:14 +0200
commitd184a728cf5c270f1653f60bc0b6b83290127121 (patch)
tree06851defd9dc65bf540049a16bed1f0ba85b1ec9
parent45f0a1156d3f3f5be76098f2acb524c19409fa52 (diff)
downloadbusybox-w32-d184a728cf5c270f1653f60bc0b6b83290127121.tar.gz
busybox-w32-d184a728cf5c270f1653f60bc0b6b83290127121.tar.bz2
busybox-w32-d184a728cf5c270f1653f60bc0b6b83290127121.zip
rename archive.h to bb_archive.h. no code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat
-rw-r--r--archival/ar.c2
-rw-r--r--archival/bbunzip.c2
-rw-r--r--archival/bzip2.c2
-rw-r--r--archival/cpio.c2
-rw-r--r--archival/dpkg.c2
-rw-r--r--archival/dpkg_deb.c2
-rw-r--r--archival/gzip.c2
-rw-r--r--archival/libarchive/data_align.c2
-rw-r--r--archival/libarchive/data_extract_all.c2
-rw-r--r--archival/libarchive/data_extract_to_command.c2
-rw-r--r--archival/libarchive/data_extract_to_stdout.c2
-rw-r--r--archival/libarchive/data_skip.c2
-rw-r--r--archival/libarchive/decompress_bunzip2.c2
-rw-r--r--archival/libarchive/decompress_uncompress.c2
-rw-r--r--archival/libarchive/decompress_unlzma.c2
-rw-r--r--archival/libarchive/decompress_unxz.c2
-rw-r--r--archival/libarchive/decompress_unzip.c2
-rw-r--r--archival/libarchive/filter_accept_all.c2
-rw-r--r--archival/libarchive/filter_accept_list.c2
-rw-r--r--archival/libarchive/filter_accept_list_reassign.c2
-rw-r--r--archival/libarchive/filter_accept_reject_list.c2
-rw-r--r--archival/libarchive/find_list_entry.c2
-rw-r--r--archival/libarchive/get_header_ar.c2
-rw-r--r--archival/libarchive/get_header_cpio.c2
-rw-r--r--archival/libarchive/get_header_tar.c2
-rw-r--r--archival/libarchive/get_header_tar_bz2.c2
-rw-r--r--archival/libarchive/get_header_tar_gz.c2
-rw-r--r--archival/libarchive/get_header_tar_lzma.c2
-rw-r--r--archival/libarchive/header_list.c2
-rw-r--r--archival/libarchive/header_skip.c2
-rw-r--r--archival/libarchive/header_verbose_list.c2
-rw-r--r--archival/libarchive/init_handle.c2
-rw-r--r--archival/libarchive/open_transformer.c2
-rw-r--r--archival/libarchive/seek_by_jump.c2
-rw-r--r--archival/libarchive/seek_by_read.c2
-rw-r--r--archival/libarchive/unpack_ar_archive.c2
-rw-r--r--archival/lzop.c2
-rw-r--r--archival/rpm.c2
-rw-r--r--archival/rpm2cpio.c2
-rw-r--r--archival/tar.c2
-rw-r--r--archival/unzip.c2
-rw-r--r--include/bb_archive.h (renamed from include/archive.h)0
-rw-r--r--libbb/appletlib.c2
-rw-r--r--libbb/read_printf.c2
-rw-r--r--miscutils/bbconfig.c2
-rw-r--r--procps/smemcap.c2
46 files changed, 45 insertions, 45 deletions
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 @@
28//usage: "\n -v Verbose" 28//usage: "\n -v Verbose"
29 29
30#include "libbb.h" 30#include "libbb.h"
31#include "archive.h" 31#include "bb_archive.h"
32#include "ar.h" 32#include "ar.h"
33 33
34#if ENABLE_FEATURE_AR_CREATE 34#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 @@
5 * Licensed under GPLv2 or later, see file LICENSE in this source tree. 5 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
6 */ 6 */
7#include "libbb.h" 7#include "libbb.h"
8#include "archive.h" 8#include "bb_archive.h"
9 9
10enum { 10enum {
11 OPT_STDOUT = 1 << 0, 11 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 @@
17//usage: "\n -f Force" 17//usage: "\n -f Force"
18 18
19#include "libbb.h" 19#include "libbb.h"
20#include "archive.h" 20#include "bb_archive.h"
21 21
22#define CONFIG_BZIP2_FAST 1 22#define CONFIG_BZIP2_FAST 1
23 23
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 @@
12 * 12 *
13 */ 13 */
14#include "libbb.h" 14#include "libbb.h"
15#include "archive.h" 15#include "bb_archive.h"
16 16
17//usage:#define cpio_trivial_usage 17//usage:#define cpio_trivial_usage
18//usage: "[-dmvu] [-F FILE]" IF_FEATURE_CPIO_O(" [-H newc]") 18//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 @@
57 57
58#include "libbb.h" 58#include "libbb.h"
59#include <fnmatch.h> 59#include <fnmatch.h>
60#include "archive.h" 60#include "bb_archive.h"
61 61
62/* note: if you vary hash_prime sizes be aware, 62/* note: if you vary hash_prime sizes be aware,
63 * 1) tweaking these will have a big effect on how much memory this program uses. 63 * 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 @@
19//usage: "$ dpkg-deb -X ./busybox_0.48-1_i386.deb /tmp\n" 19//usage: "$ dpkg-deb -X ./busybox_0.48-1_i386.deb /tmp\n"
20 20
21#include "libbb.h" 21#include "libbb.h"
22#include "archive.h" 22#include "bb_archive.h"
23 23
24#define DPKG_DEB_OPT_CONTENTS 1 24#define DPKG_DEB_OPT_CONTENTS 1
25#define DPKG_DEB_OPT_CONTROL 2 25#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
55//usage: "-rw-rw-r-- 1 andersen andersen 554058 Apr 14 17:49 /tmp/busybox.tar.gz\n" 55//usage: "-rw-rw-r-- 1 andersen andersen 554058 Apr 14 17:49 /tmp/busybox.tar.gz\n"
56 56
57#include "libbb.h" 57#include "libbb.h"
58#include "archive.h" 58#include "bb_archive.h"
59 59
60 60
61/* =========================================================================== 61/* ===========================================================================
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 @@
4 */ 4 */
5 5
6#include "libbb.h" 6#include "libbb.h"
7#include "archive.h" 7#include "bb_archive.h"
8 8
9void FAST_FUNC data_align(archive_handle_t *archive_handle, unsigned boundary) 9void FAST_FUNC data_align(archive_handle_t *archive_handle, unsigned boundary)
10{ 10{
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 @@
4 */ 4 */
5 5
6#include "libbb.h" 6#include "libbb.h"
7#include "archive.h" 7#include "bb_archive.h"
8 8
9void FAST_FUNC data_extract_all(archive_handle_t *archive_handle) 9void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
10{ 10{
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 @@
4 */ 4 */
5 5
6#include "libbb.h" 6#include "libbb.h"
7#include "archive.h" 7#include "bb_archive.h"
8 8
9enum { 9enum {
10 //TAR_FILETYPE, 10 //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 @@
4 */ 4 */
5 5
6#include "libbb.h" 6#include "libbb.h"
7#include "archive.h" 7#include "bb_archive.h"
8 8
9void FAST_FUNC data_extract_to_stdout(archive_handle_t *archive_handle) 9void FAST_FUNC data_extract_to_stdout(archive_handle_t *archive_handle)
10{ 10{
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 @@
4 */ 4 */
5 5
6#include "libbb.h" 6#include "libbb.h"
7#include "archive.h" 7#include "bb_archive.h"
8 8
9void FAST_FUNC data_skip(archive_handle_t *archive_handle) 9void FAST_FUNC data_skip(archive_handle_t *archive_handle)
10{ 10{
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 @@
40 */ 40 */
41 41
42#include "libbb.h" 42#include "libbb.h"
43#include "archive.h" 43#include "bb_archive.h"
44 44
45/* Constants for Huffman coding */ 45/* Constants for Huffman coding */
46#define MAX_GROUPS 6 46#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 @@
25 */ 25 */
26 26
27#include "libbb.h" 27#include "libbb.h"
28#include "archive.h" 28#include "bb_archive.h"
29 29
30 30
31/* Default input buffer size */ 31/* 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 @@
9 * Licensed under GPLv2 or later, see file LICENSE in this source tree. 9 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
10 */ 10 */
11#include "libbb.h" 11#include "libbb.h"
12#include "archive.h" 12#include "bb_archive.h"
13 13
14#if ENABLE_FEATURE_LZMA_FAST 14#if ENABLE_FEATURE_LZMA_FAST
15# define speed_inline ALWAYS_INLINE 15# 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 @@
10 * Licensed under GPLv2, see file LICENSE in this source tree. 10 * Licensed under GPLv2, see file LICENSE in this source tree.
11 */ 11 */
12#include "libbb.h" 12#include "libbb.h"
13#include "archive.h" 13#include "bb_archive.h"
14 14
15#define XZ_FUNC FAST_FUNC 15#define XZ_FUNC FAST_FUNC
16#define XZ_EXTERN static 16#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 @@
35 35
36#include <setjmp.h> 36#include <setjmp.h>
37#include "libbb.h" 37#include "libbb.h"
38#include "archive.h" 38#include "bb_archive.h"
39 39
40typedef struct huft_t { 40typedef struct huft_t {
41 unsigned char e; /* number of extra bits or operation */ 41 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 @@
6 */ 6 */
7 7
8#include "libbb.h" 8#include "libbb.h"
9#include "archive.h" 9#include "bb_archive.h"
10 10
11/* Accept any non-null name, its not really a filter at all */ 11/* Accept any non-null name, its not really a filter at all */
12char FAST_FUNC filter_accept_all(archive_handle_t *archive_handle) 12char 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 @@
6 */ 6 */
7 7
8#include "libbb.h" 8#include "libbb.h"
9#include "archive.h" 9#include "bb_archive.h"
10 10
11/* 11/*
12 * Accept names that are in the accept list, ignoring reject list. 12 * 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 @@
6 */ 6 */
7 7
8#include "libbb.h" 8#include "libbb.h"
9#include "archive.h" 9#include "bb_archive.h"
10 10
11/* Built and used only if ENABLE_DPKG || ENABLE_DPKG_DEB */ 11/* Built and used only if ENABLE_DPKG || ENABLE_DPKG_DEB */
12 12
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 @@
6 */ 6 */
7 7
8#include "libbb.h" 8#include "libbb.h"
9#include "archive.h" 9#include "bb_archive.h"
10 10
11/* 11/*
12 * Accept names that are in the accept list and not in the reject list 12 * 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 @@
7 7
8#include <fnmatch.h> 8#include <fnmatch.h>
9#include "libbb.h" 9#include "libbb.h"
10#include "archive.h" 10#include "bb_archive.h"
11 11
12/* Find a string in a shell pattern list */ 12/* Find a string in a shell pattern list */
13const llist_t* FAST_FUNC find_list_entry(const llist_t *list, const char *filename) 13const 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 @@
5 */ 5 */
6 6
7#include "libbb.h" 7#include "libbb.h"
8#include "archive.h" 8#include "bb_archive.h"
9#include "ar.h" 9#include "ar.h"
10 10
11static unsigned read_num(const char *str, int base) 11static 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 @@
5 */ 5 */
6 6
7#include "libbb.h" 7#include "libbb.h"
8#include "archive.h" 8#include "bb_archive.h"
9 9
10typedef struct hardlinks_t { 10typedef struct hardlinks_t {
11 struct hardlinks_t *next; 11 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 @@
12 */ 12 */
13 13
14#include "libbb.h" 14#include "libbb.h"
15#include "archive.h" 15#include "bb_archive.h"
16 16
17typedef uint32_t aliased_uint32_t FIX_ALIASING; 17typedef uint32_t aliased_uint32_t FIX_ALIASING;
18typedef off_t aliased_off_t FIX_ALIASING; 18typedef 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 @@
4 */ 4 */
5 5
6#include "libbb.h" 6#include "libbb.h"
7#include "archive.h" 7#include "bb_archive.h"
8 8
9char FAST_FUNC get_header_tar_bz2(archive_handle_t *archive_handle) 9char FAST_FUNC get_header_tar_bz2(archive_handle_t *archive_handle)
10{ 10{
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 @@
4 */ 4 */
5 5
6#include "libbb.h" 6#include "libbb.h"
7#include "archive.h" 7#include "bb_archive.h"
8 8
9char FAST_FUNC get_header_tar_gz(archive_handle_t *archive_handle) 9char FAST_FUNC get_header_tar_gz(archive_handle_t *archive_handle)
10{ 10{
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 @@
7 */ 7 */
8 8
9#include "libbb.h" 9#include "libbb.h"
10#include "archive.h" 10#include "bb_archive.h"
11 11
12char FAST_FUNC get_header_tar_lzma(archive_handle_t *archive_handle) 12char FAST_FUNC get_header_tar_lzma(archive_handle_t *archive_handle)
13{ 13{
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 @@
3 * Licensed under GPLv2 or later, see file LICENSE in this source tree. 3 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
4 */ 4 */
5#include "libbb.h" 5#include "libbb.h"
6#include "archive.h" 6#include "bb_archive.h"
7 7
8void FAST_FUNC header_list(const file_header_t *file_header) 8void FAST_FUNC header_list(const file_header_t *file_header)
9{ 9{
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 @@
3 * Licensed under GPLv2 or later, see file LICENSE in this source tree. 3 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
4 */ 4 */
5#include "libbb.h" 5#include "libbb.h"
6#include "archive.h" 6#include "bb_archive.h"
7 7
8void FAST_FUNC header_skip(const file_header_t *file_header UNUSED_PARAM) 8void FAST_FUNC header_skip(const file_header_t *file_header UNUSED_PARAM)
9{ 9{
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 @@
4 */ 4 */
5 5
6#include "libbb.h" 6#include "libbb.h"
7#include "archive.h" 7#include "bb_archive.h"
8 8
9void FAST_FUNC header_verbose_list(const file_header_t *file_header) 9void FAST_FUNC header_verbose_list(const file_header_t *file_header)
10{ 10{
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 @@
4 */ 4 */
5 5
6#include "libbb.h" 6#include "libbb.h"
7#include "archive.h" 7#include "bb_archive.h"
8 8
9archive_handle_t* FAST_FUNC init_handle(void) 9archive_handle_t* FAST_FUNC init_handle(void)
10{ 10{
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 @@
4 */ 4 */
5 5
6#include "libbb.h" 6#include "libbb.h"
7#include "archive.h" 7#include "bb_archive.h"
8 8
9/* transformer(), more than meets the eye */ 9/* transformer(), more than meets the eye */
10/* 10/*
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 @@
4 */ 4 */
5 5
6#include "libbb.h" 6#include "libbb.h"
7#include "archive.h" 7#include "bb_archive.h"
8 8
9void FAST_FUNC seek_by_jump(int fd, off_t amount) 9void FAST_FUNC seek_by_jump(int fd, off_t amount)
10{ 10{
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 @@
4 */ 4 */
5 5
6#include "libbb.h" 6#include "libbb.h"
7#include "archive.h" 7#include "bb_archive.h"
8 8
9/* If we are reading through a pipe, or from stdin then we can't lseek, 9/* If we are reading through a pipe, or from stdin then we can't lseek,
10 * we must read and discard the data to skip over it. 10 * 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 @@
4 */ 4 */
5 5
6#include "libbb.h" 6#include "libbb.h"
7#include "archive.h" 7#include "bb_archive.h"
8#include "ar.h" 8#include "ar.h"
9 9
10void FAST_FUNC unpack_ar_archive(archive_handle_t *ar_archive) 10void 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 @@
51//usage: "\n -F Don't store or verify checksum" 51//usage: "\n -F Don't store or verify checksum"
52 52
53#include "libbb.h" 53#include "libbb.h"
54#include "archive.h" 54#include "bb_archive.h"
55#include "liblzo_interface.h" 55#include "liblzo_interface.h"
56 56
57/* lzo-2.03/src/lzo_ptr.h */ 57/* 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 @@
20//usage: "\n -c List config files" 20//usage: "\n -c List config files"
21 21
22#include "libbb.h" 22#include "libbb.h"
23#include "archive.h" 23#include "bb_archive.h"
24#include "rpm.h" 24#include "rpm.h"
25 25
26#define RPM_CHAR_TYPE 1 26#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 @@
13//usage: "Output a cpio archive of the rpm file" 13//usage: "Output a cpio archive of the rpm file"
14 14
15#include "libbb.h" 15#include "libbb.h"
16#include "archive.h" 16#include "bb_archive.h"
17#include "rpm.h" 17#include "rpm.h"
18 18
19enum { rpm_fd = STDIN_FILENO }; 19enum { 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 @@
44 44
45#include <fnmatch.h> 45#include <fnmatch.h>
46#include "libbb.h" 46#include "libbb.h"
47#include "archive.h" 47#include "bb_archive.h"
48/* FIXME: Stop using this non-standard feature */ 48/* FIXME: Stop using this non-standard feature */
49#ifndef FNM_LEADING_DIR 49#ifndef FNM_LEADING_DIR
50# define FNM_LEADING_DIR 0 50# 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 @@
32//usage: "\n -d DIR Extract files into DIR" 32//usage: "\n -d DIR Extract files into DIR"
33 33
34#include "libbb.h" 34#include "libbb.h"
35#include "archive.h" 35#include "bb_archive.h"
36 36
37enum { 37enum {
38#if BB_BIG_ENDIAN 38#if BB_BIG_ENDIAN
diff --git a/include/archive.h b/include/bb_archive.h
index 9e176d335..9e176d335 100644
--- a/include/archive.h
+++ b/include/bb_archive.h
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 8157b4f42..efde3b69d 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -62,7 +62,7 @@ static const char usage_messages[] ALIGN1 = UNPACKED_USAGE;
62#if ENABLE_FEATURE_COMPRESS_USAGE 62#if ENABLE_FEATURE_COMPRESS_USAGE
63 63
64static const char packed_usage[] ALIGN1 = { PACKED_USAGE }; 64static const char packed_usage[] ALIGN1 = { PACKED_USAGE };
65# include "archive.h" 65# include "bb_archive.h"
66static const char *unpack_usage_messages(void) 66static const char *unpack_usage_messages(void)
67{ 67{
68 char *outbuf = NULL; 68 char *outbuf = NULL;
diff --git a/libbb/read_printf.c b/libbb/read_printf.c
index 192f83d6e..0bbf7802a 100644
--- a/libbb/read_printf.c
+++ b/libbb/read_printf.c
@@ -15,7 +15,7 @@
15) 15)
16 16
17#if ZIPPED 17#if ZIPPED
18# include "archive.h" 18# include "bb_archive.h"
19#endif 19#endif
20 20
21 21
diff --git a/miscutils/bbconfig.c b/miscutils/bbconfig.c
index e8be81352..e5f4eb379 100644
--- a/miscutils/bbconfig.c
+++ b/miscutils/bbconfig.c
@@ -10,7 +10,7 @@
10#include "libbb.h" 10#include "libbb.h"
11#include "bbconfigopts.h" 11#include "bbconfigopts.h"
12#if ENABLE_FEATURE_COMPRESS_BBCONFIG 12#if ENABLE_FEATURE_COMPRESS_BBCONFIG
13# include "archive.h" 13# include "bb_archive.h"
14# include "bbconfigopts_bz2.h" 14# include "bbconfigopts_bz2.h"
15#endif 15#endif
16 16
diff --git a/procps/smemcap.c b/procps/smemcap.c
index e108d88ad..9d1126a49 100644
--- a/procps/smemcap.c
+++ b/procps/smemcap.c
@@ -20,7 +20,7 @@
20//config: a memory usage statistic tool. 20//config: a memory usage statistic tool.
21 21
22#include "libbb.h" 22#include "libbb.h"
23#include "archive.h" 23#include "bb_archive.h"
24 24
25struct fileblock { 25struct fileblock {
26 struct fileblock *next; 26 struct fileblock *next;
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-18 13:30:00 +0000