# HG changeset patch # User Pascal Bellard # Date 1279549387 -7200 # Node ID 32eeee907ef291b27a3977d50bac7d659ffaf2a7 # Parent d67788c5a8d34e5e7c42dd96e12602da85b2a8f4 busybox: fix insmod diff -r d67788c5a8d3 -r 32eeee907ef2 busybox/stuff/busybox-1.17.0-zmodules.u --- a/busybox/stuff/busybox-1.17.0-zmodules.u Mon Jul 19 10:44:28 2010 +0200 +++ b/busybox/stuff/busybox-1.17.0-zmodules.u Mon Jul 19 16:23:07 2010 +0200 @@ -22,7 +22,7 @@ --- busybox-1.17.0/libbb/read_printf.c +++ busybox-1.17.0/libbb/read_printf.c -@@ -286,6 +286,16 @@ +@@ -286,6 +286,17 @@ # endif goto found_magic; } @@ -31,6 +31,7 @@ + ) { +# if BB_MMU + xformer = unpack_lzma_stream; ++ xlseek(fd, offset, SEEK_CUR); +# else + xformer_prog = "unlzma"; +# endif @@ -39,3 +40,13 @@ if (ENABLE_FEATURE_SEAMLESS_XZ && magic.b16[0] == XZ_MAGIC1 ) { +@@ -342,7 +353,8 @@ + /* .lzma has no header/signature, just trust it */ + open_transformer(fd, unpack_lzma_stream, "unlzma"); + else +- if ((ENABLE_FEATURE_SEAMLESS_GZ && strcmp(sfx, "gz") == 0) ++ if (((ENABLE_FEATURE_SEAMLESS_GZ|ENABLE_FEATURE_SEAMLESS_LZMA) ++ && strcmp(sfx, "gz") == 0) + || (ENABLE_FEATURE_SEAMLESS_BZ2 && strcmp(sfx, "bz2") == 0) + || (ENABLE_FEATURE_SEAMLESS_XZ && strcmp(sfx, "xz") == 0) + ) {