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