summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko2009-03-13 14:26:44 +0000
committerDenis Vlasenko2009-03-13 14:26:44 +0000
commit1f0b95f1473bca7282fd8189f11b81af4e7f6b6a (patch)
treef1ced48a85be3f02bfc9f6257060914c11816c01
parentc8329c956816656364e54d54932c5898a29bed70 (diff)
downloadbusybox-1f0b95f1473bca7282fd8189f11b81af4e7f6b6a.zip
busybox-1f0b95f1473bca7282fd8189f11b81af4e7f6b6a.tar.gz
tar: make FEATURE_TAR_AUTODETECT work with DESKTOP off too.
-rw-r--r--archival/libunarchive/get_header_tar.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/archival/libunarchive/get_header_tar.c b/archival/libunarchive/get_header_tar.c
index 48fc23d..0280bbc 100644
--- a/archival/libunarchive/get_header_tar.c
+++ b/archival/libunarchive/get_header_tar.c
@@ -159,7 +159,7 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
again_after_align:
-#if ENABLE_DESKTOP
+#if ENABLE_DESKTOP || ENABLE_FEATURE_TAR_AUTODETECT
/* to prevent misdetection of bz2 sig */
*(uint32_t*)(&tar) = 0;
i = full_read(archive_handle->src_fd, &tar, 512);
@@ -210,7 +210,7 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
#if ENABLE_FEATURE_TAR_AUTODETECT
char FAST_FUNC (*get_header_ptr)(archive_handle_t *);
- USE_DESKTOP(autodetect:)
+ autodetect:
/* tar gz/bz autodetect: check for gz/bz2 magic.
* If we see the magic, and it is the very first block,
* we can switch to get_header_tar_gz/bz2/lzma().