diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2009-03-13 14:26:44 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2009-03-13 14:26:44 +0000 |
| commit | 1f0b95f1473bca7282fd8189f11b81af4e7f6b6a (patch) | |
| tree | f1ced48a85be3f02bfc9f6257060914c11816c01 | |
| parent | c8329c956816656364e54d54932c5898a29bed70 (diff) | |
| download | busybox-w32-1f0b95f1473bca7282fd8189f11b81af4e7f6b6a.tar.gz busybox-w32-1f0b95f1473bca7282fd8189f11b81af4e7f6b6a.tar.bz2 busybox-w32-1f0b95f1473bca7282fd8189f11b81af4e7f6b6a.zip | |
tar: make FEATURE_TAR_AUTODETECT work with DESKTOP off too.
| -rw-r--r-- | archival/libunarchive/get_header_tar.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
| 159 | 159 | ||
| 160 | again_after_align: | 160 | again_after_align: |
| 161 | 161 | ||
| 162 | #if ENABLE_DESKTOP | 162 | #if ENABLE_DESKTOP || ENABLE_FEATURE_TAR_AUTODETECT |
| 163 | /* to prevent misdetection of bz2 sig */ | 163 | /* to prevent misdetection of bz2 sig */ |
| 164 | *(uint32_t*)(&tar) = 0; | 164 | *(uint32_t*)(&tar) = 0; |
| 165 | i = full_read(archive_handle->src_fd, &tar, 512); | 165 | i = full_read(archive_handle->src_fd, &tar, 512); |
| @@ -210,7 +210,7 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle) | |||
| 210 | #if ENABLE_FEATURE_TAR_AUTODETECT | 210 | #if ENABLE_FEATURE_TAR_AUTODETECT |
| 211 | char FAST_FUNC (*get_header_ptr)(archive_handle_t *); | 211 | char FAST_FUNC (*get_header_ptr)(archive_handle_t *); |
| 212 | 212 | ||
| 213 | USE_DESKTOP(autodetect:) | 213 | autodetect: |
| 214 | /* tar gz/bz autodetect: check for gz/bz2 magic. | 214 | /* tar gz/bz autodetect: check for gz/bz2 magic. |
| 215 | * If we see the magic, and it is the very first block, | 215 | * If we see the magic, and it is the very first block, |
| 216 | * we can switch to get_header_tar_gz/bz2/lzma(). | 216 | * we can switch to get_header_tar_gz/bz2/lzma(). |