diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2011-02-06 20:01:11 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2011-02-06 20:01:11 +0100 |
| commit | aef441cb4d567da5575c498141b21eb38dc3fdaf (patch) | |
| tree | f99a2ebecd77c614f243c4df859ee40f7281f9bc /include | |
| parent | ca18e25525267736e7e919987c50569f27d70d36 (diff) | |
| download | busybox-w32-aef441cb4d567da5575c498141b21eb38dc3fdaf.tar.gz busybox-w32-aef441cb4d567da5575c498141b21eb38dc3fdaf.tar.bz2 busybox-w32-aef441cb4d567da5575c498141b21eb38dc3fdaf.zip | |
tar: fix a bug where autodetection messes up -z on extract
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/archive.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/archive.h b/include/archive.h index ba6d323e0..49c478728 100644 --- a/include/archive.h +++ b/include/archive.h | |||
| @@ -8,22 +8,22 @@ enum { | |||
| 8 | #if BB_BIG_ENDIAN | 8 | #if BB_BIG_ENDIAN |
| 9 | COMPRESS_MAGIC = 0x1f9d, | 9 | COMPRESS_MAGIC = 0x1f9d, |
| 10 | GZIP_MAGIC = 0x1f8b, | 10 | GZIP_MAGIC = 0x1f8b, |
| 11 | BZIP2_MAGIC = 'B' * 256 + 'Z', | 11 | BZIP2_MAGIC = 256 * 'B' + 'Z', |
| 12 | /* .xz signature: 0xfd, '7', 'z', 'X', 'Z', 0x00 */ | 12 | /* .xz signature: 0xfd, '7', 'z', 'X', 'Z', 0x00 */ |
| 13 | /* More info at: http://tukaani.org/xz/xz-file-format.txt */ | 13 | /* More info at: http://tukaani.org/xz/xz-file-format.txt */ |
| 14 | XZ_MAGIC1 = 0xfd * 256 + '7', | 14 | XZ_MAGIC1 = 256 * 0xfd + '7', |
| 15 | XZ_MAGIC2 = (('z' * 256 + 'X') * 256 + 'Z') * 256 + 0, | 15 | XZ_MAGIC2 = 256 * (256 * (256 * 'z' + 'X') + 'Z') + 0, |
| 16 | /* Different form: 32 bits, then 16 bits: */ | 16 | /* Different form: 32 bits, then 16 bits: */ |
| 17 | XZ_MAGIC1a = ((0xfd * 256 + '7') * 256 + 'z') * 256 + 'X', | 17 | XZ_MAGIC1a = 256 * (256 * (256 * 0xfd + '7') + 'z') + 'X', |
| 18 | XZ_MAGIC2a = 'Z' * 256 + 0, | 18 | XZ_MAGIC2a = 256 * 'Z' + 0, |
| 19 | #else | 19 | #else |
| 20 | COMPRESS_MAGIC = 0x9d1f, | 20 | COMPRESS_MAGIC = 0x9d1f, |
| 21 | GZIP_MAGIC = 0x8b1f, | 21 | GZIP_MAGIC = 0x8b1f, |
| 22 | BZIP2_MAGIC = 'Z' * 256 + 'B', | 22 | BZIP2_MAGIC = 'B' + 'Z' * 256, |
| 23 | XZ_MAGIC1 = '7' * 256 + 0xfd, | 23 | XZ_MAGIC1 = 0xfd + '7' * 256, |
| 24 | XZ_MAGIC2 = ((0 * 256 + 'Z') * 256 + 'X') * 256 + 'z', | 24 | XZ_MAGIC2 = 'z' + ('X' + ('Z' + 0 * 256) * 256) * 256, |
| 25 | XZ_MAGIC1a = (('X' * 256 + 'z') * 256 + '7') * 256 + 0xfd, | 25 | XZ_MAGIC1a = 0xfd + ('7' + ('z' + 'X' * 256) * 256) * 256, |
| 26 | XZ_MAGIC2a = 0 * 256 + 'Z', | 26 | XZ_MAGIC2a = 'Z' + 0 * 256, |
| 27 | #endif | 27 | #endif |
| 28 | }; | 28 | }; |
| 29 | 29 | ||