aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-08-13 10:36:25 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-08-13 10:36:25 +0000
commite324184c0509cc0db168ce29546e1b52800a79c6 (patch)
tree9d4f18b3cc1ab715b6ff91cc9e3e942d11dfc51f /archival
parent5f1b149d541ebba7cab841cb647f113248f9fb8f (diff)
downloadbusybox-w32-e324184c0509cc0db168ce29546e1b52800a79c6.tar.gz
busybox-w32-e324184c0509cc0db168ce29546e1b52800a79c6.tar.bz2
busybox-w32-e324184c0509cc0db168ce29546e1b52800a79c6.zip
s/#ifdef CONFIG_/#if ENABLE_/g
Diffstat (limited to 'archival')
-rw-r--r--archival/bbunzip.c2
-rw-r--r--archival/dpkg.c8
-rw-r--r--archival/dpkg_deb.c4
-rw-r--r--archival/libunarchive/decompress_unlzma.c8
-rw-r--r--archival/libunarchive/filter_accept_list_reassign.c4
-rw-r--r--archival/libunarchive/seek_by_jump.c2
6 files changed, 15 insertions, 13 deletions
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index bd1526b20..f842d458b 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -212,7 +212,7 @@ char* make_new_name_gunzip(char *filename)
212 212
213 extension++; 213 extension++;
214 if (strcmp(extension, "tgz" + 1) == 0 214 if (strcmp(extension, "tgz" + 1) == 0
215#ifdef CONFIG_FEATURE_GUNZIP_UNCOMPRESS 215#if ENABLE_FEATURE_GUNZIP_UNCOMPRESS
216 || strcmp(extension, "Z") == 0 216 || strcmp(extension, "Z") == 0
217#endif 217#endif
218 ) { 218 ) {
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 0c1f96fc9..caa50f90d 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -1412,10 +1412,10 @@ static void init_archive_deb_control(archive_handle_t *ar_handle)
1412 tar_handle->src_fd = ar_handle->src_fd; 1412 tar_handle->src_fd = ar_handle->src_fd;
1413 1413
1414 /* We don't care about data.tar.* or debian-binary, just control.tar.* */ 1414 /* We don't care about data.tar.* or debian-binary, just control.tar.* */
1415#ifdef CONFIG_FEATURE_DEB_TAR_GZ 1415#if ENABLE_FEATURE_DEB_TAR_GZ
1416 llist_add_to(&(ar_handle->accept), (char*)"control.tar.gz"); 1416 llist_add_to(&(ar_handle->accept), (char*)"control.tar.gz");
1417#endif 1417#endif
1418#ifdef CONFIG_FEATURE_DEB_TAR_BZ2 1418#if ENABLE_FEATURE_DEB_TAR_BZ2
1419 llist_add_to(&(ar_handle->accept), (char*)"control.tar.bz2"); 1419 llist_add_to(&(ar_handle->accept), (char*)"control.tar.bz2");
1420#endif 1420#endif
1421 1421
@@ -1432,10 +1432,10 @@ static void init_archive_deb_data(archive_handle_t *ar_handle)
1432 tar_handle->src_fd = ar_handle->src_fd; 1432 tar_handle->src_fd = ar_handle->src_fd;
1433 1433
1434 /* We don't care about control.tar.* or debian-binary, just data.tar.* */ 1434 /* We don't care about control.tar.* or debian-binary, just data.tar.* */
1435#ifdef CONFIG_FEATURE_DEB_TAR_GZ 1435#if ENABLE_FEATURE_DEB_TAR_GZ
1436 llist_add_to(&(ar_handle->accept), (char*)"data.tar.gz"); 1436 llist_add_to(&(ar_handle->accept), (char*)"data.tar.gz");
1437#endif 1437#endif
1438#ifdef CONFIG_FEATURE_DEB_TAR_BZ2 1438#if ENABLE_FEATURE_DEB_TAR_BZ2
1439 llist_add_to(&(ar_handle->accept), (char*)"data.tar.bz2"); 1439 llist_add_to(&(ar_handle->accept), (char*)"data.tar.bz2");
1440#endif 1440#endif
1441 1441
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index 138caff39..6dd817101 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -31,12 +31,12 @@ int dpkg_deb_main(int argc, char **argv)
31 ar_archive->sub_archive = tar_archive; 31 ar_archive->sub_archive = tar_archive;
32 ar_archive->filter = filter_accept_list_reassign; 32 ar_archive->filter = filter_accept_list_reassign;
33 33
34#ifdef CONFIG_FEATURE_DEB_TAR_GZ 34#if ENABLE_FEATURE_DEB_TAR_GZ
35 llist_add_to(&(ar_archive->accept), (char*)"data.tar.gz"); 35 llist_add_to(&(ar_archive->accept), (char*)"data.tar.gz");
36 llist_add_to(&control_tar_llist, (char*)"control.tar.gz"); 36 llist_add_to(&control_tar_llist, (char*)"control.tar.gz");
37#endif 37#endif
38 38
39#ifdef CONFIG_FEATURE_DEB_TAR_BZ2 39#if ENABLE_FEATURE_DEB_TAR_BZ2
40 llist_add_to(&(ar_archive->accept), (char*)"data.tar.bz2"); 40 llist_add_to(&(ar_archive->accept), (char*)"data.tar.bz2");
41 llist_add_to(&control_tar_llist, (char*)"control.tar.bz2"); 41 llist_add_to(&control_tar_llist, (char*)"control.tar.bz2");
42#endif 42#endif
diff --git a/archival/libunarchive/decompress_unlzma.c b/archival/libunarchive/decompress_unlzma.c
index 2800a7ecd..4f36c060f 100644
--- a/archival/libunarchive/decompress_unlzma.c
+++ b/archival/libunarchive/decompress_unlzma.c
@@ -12,7 +12,7 @@
12#include "libbb.h" 12#include "libbb.h"
13#include "unarchive.h" 13#include "unarchive.h"
14 14
15#ifdef CONFIG_FEATURE_LZMA_FAST 15#if ENABLE_FEATURE_LZMA_FAST
16# define speed_inline ALWAYS_INLINE 16# define speed_inline ALWAYS_INLINE
17#else 17#else
18# define speed_inline 18# define speed_inline
@@ -99,9 +99,11 @@ static ALWAYS_INLINE void rc_normalize(rc_t * rc)
99 } 99 }
100} 100}
101 101
102/* Called 9 times */ 102/* rc_is_bit_0 is called 9 times */
103/* Why rc_is_bit_0_helper exists? 103/* Why rc_is_bit_0_helper exists?
104 * Because we want to always expose (rc->code < rc->bound) to optimizer 104 * Because we want to always expose (rc->code < rc->bound) to optimizer.
105 * Thus rc_is_bit_0 is always inlined, and rc_is_bit_0_helper is inlined
106 * only if we compile for speed.
105 */ 107 */
106static speed_inline uint32_t rc_is_bit_0_helper(rc_t * rc, uint16_t * p) 108static speed_inline uint32_t rc_is_bit_0_helper(rc_t * rc, uint16_t * p)
107{ 109{
diff --git a/archival/libunarchive/filter_accept_list_reassign.c b/archival/libunarchive/filter_accept_list_reassign.c
index 0fb536fad..969dd1e3e 100644
--- a/archival/libunarchive/filter_accept_list_reassign.c
+++ b/archival/libunarchive/filter_accept_list_reassign.c
@@ -23,13 +23,13 @@ char filter_accept_list_reassign(archive_handle_t *archive_handle)
23 name_ptr = strrchr(archive_handle->file_header->name, '.'); 23 name_ptr = strrchr(archive_handle->file_header->name, '.');
24 24
25 /* Modify the subarchive handler based on the extension */ 25 /* Modify the subarchive handler based on the extension */
26#ifdef CONFIG_FEATURE_DEB_TAR_GZ 26#if ENABLE_FEATURE_DEB_TAR_GZ
27 if (strcmp(name_ptr, ".gz") == 0) { 27 if (strcmp(name_ptr, ".gz") == 0) {
28 archive_handle->action_data_subarchive = get_header_tar_gz; 28 archive_handle->action_data_subarchive = get_header_tar_gz;
29 return EXIT_SUCCESS; 29 return EXIT_SUCCESS;
30 } 30 }
31#endif 31#endif
32#ifdef CONFIG_FEATURE_DEB_TAR_BZ2 32#if ENABLE_FEATURE_DEB_TAR_BZ2
33 if (strcmp(name_ptr, ".bz2") == 0) { 33 if (strcmp(name_ptr, ".bz2") == 0) {
34 archive_handle->action_data_subarchive = get_header_tar_bz2; 34 archive_handle->action_data_subarchive = get_header_tar_bz2;
35 return EXIT_SUCCESS; 35 return EXIT_SUCCESS;
diff --git a/archival/libunarchive/seek_by_jump.c b/archival/libunarchive/seek_by_jump.c
index 6cd256418..edbf46b21 100644
--- a/archival/libunarchive/seek_by_jump.c
+++ b/archival/libunarchive/seek_by_jump.c
@@ -9,7 +9,7 @@
9void seek_by_jump(const archive_handle_t *archive_handle, const unsigned int amount) 9void seek_by_jump(const archive_handle_t *archive_handle, const unsigned int amount)
10{ 10{
11 if (lseek(archive_handle->src_fd, (off_t) amount, SEEK_CUR) == (off_t) -1) { 11 if (lseek(archive_handle->src_fd, (off_t) amount, SEEK_CUR) == (off_t) -1) {
12#ifdef CONFIG_FEATURE_UNARCHIVE_TAPE 12#if ENABLE_FEATURE_UNARCHIVE_TAPE
13 if (errno == ESPIPE) { 13 if (errno == ESPIPE) {
14 seek_by_read(archive_handle, amount); 14 seek_by_read(archive_handle, amount);
15 } else 15 } else