wok-6.x annotate busybox/stuff/busybox-1.30-zmodules.u @ rev 23018
updated libcdio-paranoia and libcdio-paranoia-dev (10.2+0.94+2 -> 10.2.2.0.1)
| author | Hans-G?nter Theisgen |
|---|---|
| date | Tue Mar 03 13:55:44 2020 +0100 (2020-03-03) |
| parents | |
| children |
| rev | line source |
|---|---|
| pascal@20652 | 1 Add LZMA_DEFAULT_MAGIC support |
| pascal@20652 | 2 --- busybox-1.30/archival/libarchive/open_transformer.c |
| pascal@20652 | 3 +++ busybox-1.30/archival/libarchive/open_transformer.c |
| pascal@20652 | 4 @@ -173,6 +173,23 @@ |
| pascal@20652 | 5 /* .gz and .bz2 both have 2-byte signature, and their |
| pascal@20652 | 6 * unpack_XXX_stream wants this header skipped. */ |
| pascal@20652 | 7 xread(fd, magic.b16, sizeof(magic.b16[0])); |
| pascal@20652 | 8 +#if 1 |
| pascal@20652 | 9 +// SliTaz may use .gz suffix for lzma'd kernel modules |
| pascal@20652 | 10 +#if BB_BIG_ENDIAN |
| pascal@20652 | 11 +#define LZMA_DEFAULT_MAGIC 0x5d00 |
| pascal@20652 | 12 +#else |
| pascal@20652 | 13 +#define LZMA_DEFAULT_MAGIC 0x5d |
| pascal@20652 | 14 +#endif |
| pascal@20652 | 15 + if (ENABLE_FEATURE_SEAMLESS_LZMA |
| pascal@20652 | 16 + && magic.b16[0] == LZMA_DEFAULT_MAGIC |
| pascal@20652 | 17 + ) { |
| pascal@20652 | 18 + xlseek(fd, -xstate->signature_skipped, SEEK_CUR); |
| pascal@20652 | 19 + xstate->signature_skipped = 0; |
| pascal@20652 | 20 + xstate->xformer = unpack_lzma_stream; |
| pascal@20652 | 21 + USE_FOR_NOMMU(xstate->xformer_prog = "unlzma";) |
| pascal@20652 | 22 + goto found_magic; |
| pascal@20652 | 23 + } |
| pascal@20652 | 24 +#endif |
| pascal@20652 | 25 if (ENABLE_FEATURE_SEAMLESS_GZ |
| pascal@20652 | 26 && magic.b16[0] == GZIP_MAGIC |
| pascal@20652 | 27 ) { |