wok annotate busybox/stuff/busybox-1.17.0-zmodules.u @ rev 5773

Up busybox (1.17.0)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Jul 06 15:09:01 2010 +0200 (2010-07-06)
parents
children 1ed09465c0ae
rev   line source
pascal@5773 1 --- busybox-1.17.0/modutils/depmod.c
pascal@5773 2 +++ busybox-1.17.0/modutils/depmod.c
pascal@5773 3 @@ -35,7 +35,10 @@
pascal@5773 4 ARG_e = (1<<3), /* with -F, print unresolved symbols */
pascal@5773 5 ARG_F = (1<<4), /* System.map that contains the symbols */
pascal@5773 6 ARG_n = (1<<5), /* dry-run, print to stdout only */
pascal@5773 7 - ARG_r = (1<<6) /* Compat dummy. Linux Makefile uses it */
pascal@5773 8 + ARG_r = (1<<6), /* Compat dummy. Linux Makefile uses it */
pascal@5773 9 + ARG_u = (1<<7), /* unresolved-error: ignored */
pascal@5773 10 + ARG_q = (1<<8), /* quiet: ignored */
pascal@5773 11 + ARG_C = (1<<9) /* config: ignored */
pascal@5773 12 };
pascal@5773 13
pascal@5773 14 static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARAM,
pascal@5773 15 @@ -143,7 +146,7 @@
pascal@5773 16 struct utsname uts;
pascal@5773 17 int tmp;
pascal@5773 18
pascal@5773 19 - getopt32(argv, "aAb:eF:nr", &moddir_base, NULL);
pascal@5773 20 + getopt32(argv, "aAb:eF:nruqC:", &moddir_base, NULL);
pascal@5773 21 argv += optind;
pascal@5773 22
pascal@5773 23 /* goto modules location */
pascal@5773 24
pascal@5773 25 --- busybox-1.17.0/libbb/read_printf.c
pascal@5773 26 +++ busybox-1.17.0/libbb/read_printf.c
pascal@5773 27 @@ -337,10 +337,16 @@
pascal@5773 28
pascal@5773 29 sfx = strrchr(fname, '.');
pascal@5773 30 if (sfx) {
pascal@5773 31 + char magic[2];
pascal@5773 32 +
pascal@5773 33 sfx++;
pascal@5773 34 - if (ENABLE_FEATURE_SEAMLESS_LZMA && strcmp(sfx, "lzma") == 0)
pascal@5773 35 - /* .lzma has no header/signature, just trust it */
pascal@5773 36 + xread(fd, &magic, 2);
pascal@5773 37 + xlseek(fd, 0, SEEK_SET);
pascal@5773 38 + if (ENABLE_FEATURE_SEAMLESS_LZMA
pascal@5773 39 + && ((magic[0] == 0x5d && magic[1] == 0)
pascal@5773 40 + || strcmp(sfx, ".lzma") == 0)) {
pascal@5773 41 open_transformer(fd, unpack_lzma_stream, "unlzma");
pascal@5773 42 + }
pascal@5773 43 else
pascal@5773 44 if ((ENABLE_FEATURE_SEAMLESS_GZ && strcmp(sfx, "gz") == 0)
pascal@5773 45 || (ENABLE_FEATURE_SEAMLESS_BZ2 && strcmp(sfx, "bz2") == 0)