rev |
line source |
pascal@5684
|
1 --- busybox-1.16.1/modutils/depmod.c
|
pascal@5684
|
2 +++ busybox-1.16.1/modutils/depmod.c
|
pascal@5684
|
3 @@ -37,7 +37,10 @@
|
pascal@5684
|
4 ARG_e = (1<<3), /* with -F, print unresolved symbols */
|
pascal@5684
|
5 ARG_F = (1<<4), /* System.map that contains the symbols */
|
pascal@5684
|
6 ARG_n = (1<<5), /* dry-run, print to stdout only */
|
pascal@5684
|
7 - ARG_r = (1<<6) /* Compat dummy. Linux Makefile uses it */
|
pascal@5684
|
8 + ARG_r = (1<<6), /* Compat dummy. Linux Makefile uses it */
|
pascal@5684
|
9 + ARG_u = (1<<7), /* unresolved-error: ignored */
|
pascal@5684
|
10 + ARG_q = (1<<8), /* quiet: ignored */
|
pascal@5684
|
11 + ARG_C = (1<<9) /* config: ignored */
|
pascal@5684
|
12 };
|
pascal@5684
|
13
|
pascal@5684
|
14 static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARAM,
|
pascal@5684
|
15 @@ -143,7 +146,7 @@
|
pascal@5684
|
16 struct utsname uts;
|
pascal@5684
|
17 int tmp;
|
pascal@5684
|
18
|
pascal@5684
|
19 - getopt32(argv, "aAb:eF:nr", &moddir_base, NULL);
|
pascal@5684
|
20 + getopt32(argv, "aAb:eF:nruqC:", &moddir_base, NULL);
|
pascal@5684
|
21 argv += optind;
|
pascal@5684
|
22
|
pascal@5684
|
23 /* goto modules location */
|
pascal@5684
|
24
|
pascal@5684
|
25 --- busybox-1.16.1/libbb/read.c
|
pascal@5684
|
26 +++ busybox-1.16.1/libbb/read.c
|
pascal@5684
|
27 @@ -328,16 +328,18 @@
|
pascal@5684
|
28
|
pascal@5684
|
29 sfx = strrchr(fname, '.');
|
pascal@5684
|
30 if (sfx) {
|
pascal@5684
|
31 - if (ENABLE_FEATURE_SEAMLESS_LZMA && strcmp(sfx, ".lzma") == 0)
|
pascal@5684
|
32 - /* .lzma has no header/signature, just trust it */
|
pascal@5684
|
33 + xread(fd, &magic, 2);
|
pascal@5684
|
34 + if (ENABLE_FEATURE_SEAMLESS_LZMA &&
|
pascal@5684
|
35 + ((magic[0] == 0x5d && magic[1] == 0) || strcmp(sfx, ".lzma") == 0)) {
|
pascal@5684
|
36 + xlseek(fd, 0, SEEK_SET);
|
pascal@5684
|
37 open_transformer(fd, unpack_lzma_stream, "unlzma");
|
pascal@5684
|
38 + }
|
pascal@5684
|
39 else
|
pascal@5684
|
40 if ((ENABLE_FEATURE_SEAMLESS_GZ && strcmp(sfx, ".gz") == 0)
|
pascal@5684
|
41 || (ENABLE_FEATURE_SEAMLESS_BZ2 && strcmp(sfx, ".bz2") == 0)
|
pascal@5684
|
42 ) {
|
pascal@5684
|
43 /* .gz and .bz2 both have 2-byte signature, and their
|
pascal@5684
|
44 * unpack_XXX_stream wants this header skipped. */
|
pascal@5684
|
45 - xread(fd, &magic, 2);
|
pascal@5684
|
46 #if ENABLE_FEATURE_SEAMLESS_GZ
|
pascal@5684
|
47 #if BB_MMU
|
pascal@5684
|
48 xformer = unpack_gz_stream;
|