wok-6.x view 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 |
line source
1 Add LZMA_DEFAULT_MAGIC support
2 --- busybox-1.30/archival/libarchive/open_transformer.c
3 +++ busybox-1.30/archival/libarchive/open_transformer.c
4 @@ -173,6 +173,23 @@
5 /* .gz and .bz2 both have 2-byte signature, and their
6 * unpack_XXX_stream wants this header skipped. */
7 xread(fd, magic.b16, sizeof(magic.b16[0]));
8 +#if 1
9 +// SliTaz may use .gz suffix for lzma'd kernel modules
10 +#if BB_BIG_ENDIAN
11 +#define LZMA_DEFAULT_MAGIC 0x5d00
12 +#else
13 +#define LZMA_DEFAULT_MAGIC 0x5d
14 +#endif
15 + if (ENABLE_FEATURE_SEAMLESS_LZMA
16 + && magic.b16[0] == LZMA_DEFAULT_MAGIC
17 + ) {
18 + xlseek(fd, -xstate->signature_skipped, SEEK_CUR);
19 + xstate->signature_skipped = 0;
20 + xstate->xformer = unpack_lzma_stream;
21 + USE_FOR_NOMMU(xstate->xformer_prog = "unlzma";)
22 + goto found_magic;
23 + }
24 +#endif
25 if (ENABLE_FEATURE_SEAMLESS_GZ
26 && magic.b16[0] == GZIP_MAGIC
27 ) {