wok-current rev 5861

busybox: fix insmod
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Jul 19 16:23:07 2010 +0200 (2010-07-19)
parents d67788c5a8d3
children 1bc38e51b3d9
files busybox/stuff/busybox-1.17.0-zmodules.u
line diff
     1.1 --- a/busybox/stuff/busybox-1.17.0-zmodules.u	Mon Jul 19 10:44:28 2010 +0200
     1.2 +++ b/busybox/stuff/busybox-1.17.0-zmodules.u	Mon Jul 19 16:23:07 2010 +0200
     1.3 @@ -22,7 +22,7 @@
     1.4  
     1.5  --- busybox-1.17.0/libbb/read_printf.c
     1.6  +++ busybox-1.17.0/libbb/read_printf.c
     1.7 -@@ -286,6 +286,16 @@
     1.8 +@@ -286,6 +286,17 @@
     1.9   # endif
    1.10   		goto found_magic;
    1.11   	}
    1.12 @@ -31,6 +31,7 @@
    1.13  +	) {
    1.14  +# if BB_MMU
    1.15  +		xformer = unpack_lzma_stream;
    1.16 ++		xlseek(fd, offset, SEEK_CUR);
    1.17  +# else
    1.18  +		xformer_prog = "unlzma";
    1.19  +# endif
    1.20 @@ -39,3 +40,13 @@
    1.21   	if (ENABLE_FEATURE_SEAMLESS_XZ
    1.22   	 && magic.b16[0] == XZ_MAGIC1
    1.23   	) {
    1.24 +@@ -342,7 +353,8 @@
    1.25 + 			/* .lzma has no header/signature, just trust it */
    1.26 + 			open_transformer(fd, unpack_lzma_stream, "unlzma");
    1.27 + 		else
    1.28 +-		if ((ENABLE_FEATURE_SEAMLESS_GZ && strcmp(sfx, "gz") == 0)
    1.29 ++		if (((ENABLE_FEATURE_SEAMLESS_GZ|ENABLE_FEATURE_SEAMLESS_LZMA)
    1.30 ++		  && strcmp(sfx, "gz") == 0)
    1.31 + 		 || (ENABLE_FEATURE_SEAMLESS_BZ2 && strcmp(sfx, "bz2") == 0)
    1.32 + 		 || (ENABLE_FEATURE_SEAMLESS_XZ && strcmp(sfx, "xz") == 0)
    1.33 + 		) {