wok annotate busybox/stuff/busybox-1.18.2-zmodules.u @ rev 8159

Updated busybox for tazwok-experimental.
author Christopher Rogers <slaxemulator@gmail.com>
date Wed Jan 26 18:02:11 2011 +0000 (2011-01-26)
parents
children
rev   line source
slaxemulator@8159 1 Add LZMA_DEFAULT_MAGIC support
slaxemulator@8159 2 --- busybox-1.18.0/include/archive.h
slaxemulator@8159 3 +++ busybox-1.18.0/include/archive.h
slaxemulator@8159 4 @@ -9,6 +9,8 @@
slaxemulator@8159 5 COMPRESS_MAGIC = 0x1f9d,
slaxemulator@8159 6 GZIP_MAGIC = 0x1f8b,
slaxemulator@8159 7 BZIP2_MAGIC = 'B' * 256 + 'Z',
slaxemulator@8159 8 + /* lzma default options: lc=3 lp=0 pb=2, historic % 256 == 0 */
slaxemulator@8159 9 + LZMA_DEFAULT_MAGIC = 0x5d00,
slaxemulator@8159 10 /* .xz signature: 0xfd, '7', 'z', 'X', 'Z', 0x00 */
slaxemulator@8159 11 /* More info at: http://tukaani.org/xz/xz-file-format.txt */
slaxemulator@8159 12 XZ_MAGIC1 = 0xfd * 256 + '7',
slaxemulator@8159 13 @@ -20,6 +22,8 @@
slaxemulator@8159 14 COMPRESS_MAGIC = 0x9d1f,
slaxemulator@8159 15 GZIP_MAGIC = 0x8b1f,
slaxemulator@8159 16 BZIP2_MAGIC = 'Z' * 256 + 'B',
slaxemulator@8159 17 + /* lzma default options: lc=3 lp=0 pb=2, historic % 256 == 0 */
slaxemulator@8159 18 + LZMA_DEFAULT_MAGIC = 0x5d,
slaxemulator@8159 19 XZ_MAGIC1 = '7' * 256 + 0xfd,
slaxemulator@8159 20 XZ_MAGIC2 = ((0 * 256 + 'Z') * 256 + 'X') * 256 + 'z',
slaxemulator@8159 21 XZ_MAGIC1a = (('X' * 256 + 'z') * 256 + '7') * 256 + 0xfd,
slaxemulator@8159 22
slaxemulator@8159 23 --- busybox-1.17.1/libbb/read_printf.c
slaxemulator@8159 24 +++ busybox-1.17.1/libbb/read_printf.c
slaxemulator@8159 25 @@ -286,6 +286,17 @@
slaxemulator@8159 26 # endif
slaxemulator@8159 27 goto found_magic;
slaxemulator@8159 28 }
slaxemulator@8159 29 + if (ENABLE_FEATURE_SEAMLESS_LZMA
slaxemulator@8159 30 + && magic.b16[0] == LZMA_DEFAULT_MAGIC
slaxemulator@8159 31 + ) {
slaxemulator@8159 32 +# if BB_MMU
slaxemulator@8159 33 + xformer = unpack_lzma_stream;
slaxemulator@8159 34 + xlseek(fd, offset, SEEK_CUR);
slaxemulator@8159 35 +# else
slaxemulator@8159 36 + xformer_prog = "unlzma";
slaxemulator@8159 37 +# endif
slaxemulator@8159 38 + goto found_magic;
slaxemulator@8159 39 + }
slaxemulator@8159 40 if (ENABLE_FEATURE_SEAMLESS_XZ
slaxemulator@8159 41 && magic.b16[0] == XZ_MAGIC1
slaxemulator@8159 42 ) {
slaxemulator@8159 43 @@ -342,7 +353,8 @@
slaxemulator@8159 44 /* .lzma has no header/signature, just trust it */
slaxemulator@8159 45 open_transformer(fd, unpack_lzma_stream, "unlzma");
slaxemulator@8159 46 else
slaxemulator@8159 47 - if ((ENABLE_FEATURE_SEAMLESS_GZ && strcmp(sfx, "gz") == 0)
slaxemulator@8159 48 + if (((ENABLE_FEATURE_SEAMLESS_GZ|ENABLE_FEATURE_SEAMLESS_LZMA)
slaxemulator@8159 49 + && strcmp(sfx, "gz") == 0)
slaxemulator@8159 50 || (ENABLE_FEATURE_SEAMLESS_BZ2 && strcmp(sfx, "bz2") == 0)
slaxemulator@8159 51 || (ENABLE_FEATURE_SEAMLESS_XZ && strcmp(sfx, "xz") == 0)
slaxemulator@8159 52 ) {