From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Fri, 13 Mar 2009 14:26:44 +0000 (-0000)
Subject: tar: make FEATURE_TAR_AUTODETECT work with DESKTOP off too.
X-Git-Tag: 1_14_0~248
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1f0b95f1473bca7282fd8189f11b81af4e7f6b6a;p=oweals%2Fbusybox.git

tar: make FEATURE_TAR_AUTODETECT work with DESKTOP off too.
---

diff --git a/archival/libunarchive/get_header_tar.c b/archival/libunarchive/get_header_tar.c
index 48fc23d8b..0280bbc91 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().