wok-6.x annotate busybox/stuff/busybox-1.31-zmodules.u @ rev 23042
gcc83-lib-base: add /usr/libgcc83/libstdc++.la
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Thu Mar 05 12:13:42 2020 +0100 (2020-03-05) |
| parents | |
| children |
| rev | line source |
|---|---|
| pascal@21761 | 1 Add LZMA_DEFAULT_MAGIC support |
| pascal@21761 | 2 --- busybox-1.31/archival/libarchive/open_transformer.c |
| pascal@21761 | 3 +++ busybox-1.31/archival/libarchive/open_transformer.c |
| pascal@21761 | 4 @@ -168,6 +168,23 @@ |
| pascal@21761 | 5 * unpack_XXX_stream wants this header skipped. */ |
| pascal@21761 | 6 xstate->signature_skipped = 2; |
| pascal@21761 | 7 xread(fd, xstate->magic.b16, 2); |
| pascal@21761 | 8 +#if 1 |
| pascal@21761 | 9 +// SliTaz may use .gz suffix for lzma'd kernel modules |
| pascal@21761 | 10 +#if BB_BIG_ENDIAN |
| pascal@21761 | 11 +#define LZMA_DEFAULT_MAGIC 0x5d00 |
| pascal@21761 | 12 +#else |
| pascal@21761 | 13 +#define LZMA_DEFAULT_MAGIC 0x5d |
| pascal@21761 | 14 +#endif |
| pascal@21761 | 15 + if (ENABLE_FEATURE_SEAMLESS_LZMA |
| pascal@21761 | 16 + && xstate->magic.b16[0] == LZMA_DEFAULT_MAGIC |
| pascal@21761 | 17 + ) { |
| pascal@21761 | 18 + xlseek(fd, -xstate->signature_skipped, SEEK_CUR); |
| pascal@21761 | 19 + xstate->signature_skipped = 0; |
| pascal@21761 | 20 + xstate->xformer = unpack_lzma_stream; |
| pascal@21761 | 21 + USE_FOR_NOMMU(xstate->xformer_prog = "unlzma";) |
| pascal@21761 | 22 + goto found_magic; |
| pascal@21761 | 23 + } |
| pascal@21761 | 24 +#endif |
| pascal@21761 | 25 if (ENABLE_FEATURE_SEAMLESS_GZ |
| pascal@21761 | 26 && xstate->magic.b16[0] == GZIP_MAGIC |
| pascal@21761 | 27 ) { |