diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-08-14 16:43:01 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-08-14 16:43:01 +0000 |
| commit | dbe6e66d6a8addbbf9438f40a645be8ae105fa8a (patch) | |
| tree | a745eb3196d4c031568256345790d85bc29edc63 /archival | |
| parent | a1120a8ea29d4a825cbbb796fa15d77b15ca401f (diff) | |
| download | busybox-dbe6e66d6a8addbbf9438f40a645be8ae105fa8a.tar.gz | |
trylink: automatically use custom link script if user provides one
vinfo_msg: one user (info_msg), incorporate in it
*: style fixes
Diffstat (limited to 'archival')
| -rw-r--r-- | archival/bbunzip.c | 2 | ||||
| -rw-r--r-- | archival/dpkg.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/archival/bbunzip.c b/archival/bbunzip.c index f842d458b..f824fcf67 100644 --- a/archival/bbunzip.c +++ b/archival/bbunzip.c @@ -212,7 +212,7 @@ char* make_new_name_gunzip(char *filename) extension++; if (strcmp(extension, "tgz" + 1) == 0 -#if ENABLE_FEATURE_GUNZIP_UNCOMPRESS +#if ENABLE_FEATURE_GUNZIP_UNCOMPRESS || strcmp(extension, "Z") == 0 #endif ) { diff --git a/archival/dpkg.c b/archival/dpkg.c index caa50f90d..b5fc06d3d 100644 --- a/archival/dpkg.c +++ b/archival/dpkg.c @@ -1412,10 +1412,10 @@ static void init_archive_deb_control(archive_handle_t *ar_handle) tar_handle->src_fd = ar_handle->src_fd; /* We don't care about data.tar.* or debian-binary, just control.tar.* */ -#if ENABLE_FEATURE_DEB_TAR_GZ +#if ENABLE_FEATURE_DEB_TAR_GZ llist_add_to(&(ar_handle->accept), (char*)"control.tar.gz"); #endif -#if ENABLE_FEATURE_DEB_TAR_BZ2 +#if ENABLE_FEATURE_DEB_TAR_BZ2 llist_add_to(&(ar_handle->accept), (char*)"control.tar.bz2"); #endif @@ -1432,10 +1432,10 @@ static void init_archive_deb_data(archive_handle_t *ar_handle) tar_handle->src_fd = ar_handle->src_fd; /* We don't care about control.tar.* or debian-binary, just data.tar.* */ -#if ENABLE_FEATURE_DEB_TAR_GZ +#if ENABLE_FEATURE_DEB_TAR_GZ llist_add_to(&(ar_handle->accept), (char*)"data.tar.gz"); #endif -#if ENABLE_FEATURE_DEB_TAR_BZ2 +#if ENABLE_FEATURE_DEB_TAR_BZ2 llist_add_to(&(ar_handle->accept), (char*)"data.tar.bz2"); #endif |