svn commit: [25643] trunk/busybox/archival/libunarchive

vda at busybox.net vda at busybox.net
Fri Mar 13 14:26:44 UTC 2009


Author: vda
Date: 2009-03-13 14:26:44 +0000 (Fri, 13 Mar 2009)
New Revision: 25643

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



Modified:
   trunk/busybox/archival/libunarchive/get_header_tar.c


Changeset:
Modified: trunk/busybox/archival/libunarchive/get_header_tar.c
===================================================================
--- trunk/busybox/archival/libunarchive/get_header_tar.c	2009-03-13 06:17:48 UTC (rev 25642)
+++ trunk/busybox/archival/libunarchive/get_header_tar.c	2009-03-13 14:26:44 UTC (rev 25643)
@@ -159,7 +159,7 @@
 
  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 @@
 #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().



More information about the busybox-cvs mailing list