wok-current rev 12554

busybox: fix lzma'ed modules
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Apr 28 13:04:22 2012 +0200 (2012-04-28)
parents c359aaa7c2a8
children a619433464a8
files busybox/stuff/busybox-1.20-zmodules.u runcom/stuff/runcom.c
line diff
     1.1 --- a/busybox/stuff/busybox-1.20-zmodules.u	Fri Apr 27 15:57:34 2012 +0200
     1.2 +++ b/busybox/stuff/busybox-1.20-zmodules.u	Sat Apr 28 13:04:22 2012 +0200
     1.3 @@ -15,9 +15,9 @@
     1.4  +	if (ENABLE_FEATURE_SEAMLESS_LZMA
     1.5  +	 && magic.b16[0] == LZMA_DEFAULT_MAGIC
     1.6  +	) {
     1.7 -+		USE_FOR_MMU(xformer = unpack_lzma_stream;)
     1.8 -+		USE_FOR_NOMMU(xformer_prog = "unlzma";)
     1.9 -+		goto found_magic;
    1.10 ++		xlseek(fd, offset, SEEK_CUR);
    1.11 ++		open_transformer_with_sig(fd, unpack_lzma_stream, "unlzma");
    1.12 ++		return 0;
    1.13  +	}
    1.14  +#endif
    1.15   	if (ENABLE_FEATURE_SEAMLESS_GZ
     2.1 --- a/runcom/stuff/runcom.c	Fri Apr 27 15:57:34 2012 +0200
     2.2 +++ b/runcom/stuff/runcom.c	Sat Apr 28 13:04:22 2012 +0200
     2.3 @@ -489,7 +489,7 @@
     2.4                  goto failed;
     2.5              }
     2.6      	}
     2.7 -        if (lseek(fd, first_sector, SEEK_CUR) >= 0 &&
     2.8 +        if (lseek(fd, first_sector, SEEK_SET) >= 0 &&
     2.9              read(fd, buffer, sector_count) == sector_count) {
    2.10              r->eax &= ~0xff00;
    2.11              r->eflags &= ~CF_MASK;