emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tar: make FEATURE_TAR_AUTODETECT work with DESKTOP off too.

Browse Source
This commit is contained in:
Denis Vlasenko 2009-03-13 14:26:44 +00:00
parent c8329c9568
commit 1f0b95f147
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archival/libunarchive/get_header_tar.c
View File

@ -159,7 +159,7 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
again_after_align: again_after_align:
#if ENABLE_DESKTOP #if ENABLE_DESKTOP || ENABLE_FEATURE_TAR_AUTODETECT
/* to prevent misdetection of bz2 sig */ /* to prevent misdetection of bz2 sig */
*(uint32_t*)(&tar) = 0; *(uint32_t*)(&tar) = 0;
i = full_read(archive_handle->src_fd, &tar, 512); 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 #if ENABLE_FEATURE_TAR_AUTODETECT
char FAST_FUNC (*get_header_ptr)(archive_handle_t *); char FAST_FUNC (*get_header_ptr)(archive_handle_t *);
USE_DESKTOP(autodetect:) autodetect:
/* tar gz/bz autodetect: check for gz/bz2 magic. /* tar gz/bz autodetect: check for gz/bz2 magic.
* If we see the magic, and it is the very first block, * If we see the magic, and it is the very first block,
* we can switch to get_header_tar_gz/bz2/lzma(). * we can switch to get_header_tar_gz/bz2/lzma().