wok-undigest view busybox/stuff/busybox-1.19-zmodules.u @ rev 543
busybox/httpd: check system passwords (if FEATURE_HTTPD_AUTH_MD5)
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Sat Nov 05 19:54:07 2011 +0100 (2011-11-05) |
| parents | |
| children |
line source
1 Add LZMA_DEFAULT_MAGIC support
2 --- busybox-1.19.0/include/archive.h
3 +++ busybox-1.19.0/include/archive.h
4 @@ -9,6 +9,8 @@
5 COMPRESS_MAGIC = 0x1f9d,
6 GZIP_MAGIC = 0x1f8b,
7 BZIP2_MAGIC = 256 * 'B' + 'Z',
8 + /* lzma default options: lc=3 lp=0 pb=2, historic % 256 == 0 */
9 + LZMA_DEFAULT_MAGIC = 0x5d00,
10 /* .xz signature: 0xfd, '7', 'z', 'X', 'Z', 0x00 */
11 /* More info at: http://tukaani.org/xz/xz-file-format.txt */
12 XZ_MAGIC1 = 256 * 0xfd + '7',
13 @@ -20,6 +22,8 @@
14 COMPRESS_MAGIC = 0x9d1f,
15 GZIP_MAGIC = 0x8b1f,
16 BZIP2_MAGIC = 'B' + 'Z' * 256,
17 + /* lzma default options: lc=3 lp=0 pb=2, historic % 256 == 0 */
18 + LZMA_DEFAULT_MAGIC = 0x5d,
19 XZ_MAGIC1 = 0xfd + '7' * 256,
20 XZ_MAGIC2 = 'z' + ('X' + ('Z' + 0 * 256) * 256) * 256,
21 XZ_MAGIC1a = 0xfd + ('7' + ('z' + 'X' * 256) * 256) * 256,
23 --- busybox-1.19.0/libbb/read_printf.c
24 +++ busybox-1.19.0/libbb/read_printf.c
25 @@ -289,6 +289,17 @@
26 # endif
27 goto found_magic;
28 }
29 + if (ENABLE_FEATURE_SEAMLESS_LZMA
30 + && magic.b16[0] == LZMA_DEFAULT_MAGIC
31 + ) {
32 +# if BB_MMU
33 + xformer = unpack_lzma_stream;
34 + xlseek(fd, offset, SEEK_CUR);
35 +# else
36 + xformer_prog = "unlzma";
37 +# endif
38 + goto found_magic;
39 + }
40 if (ENABLE_FEATURE_SEAMLESS_XZ
41 && magic.b16[0] == XZ_MAGIC1
42 ) {
43 @@ -345,7 +356,8 @@
44 /* .lzma has no header/signature, just trust it */
45 open_transformer(fd, unpack_lzma_stream, "unlzma");
46 else
47 - if ((ENABLE_FEATURE_SEAMLESS_GZ && strcmp(sfx, "gz") == 0)
48 + if (((ENABLE_FEATURE_SEAMLESS_GZ|ENABLE_FEATURE_SEAMLESS_LZMA)
49 + && strcmp(sfx, "gz") == 0)
50 || (ENABLE_FEATURE_SEAMLESS_BZ2 && strcmp(sfx, "bz2") == 0)
51 || (ENABLE_FEATURE_SEAMLESS_XZ && strcmp(sfx, "xz") == 0)
52 ) {