SliTaz Repositories

     1.1 --- a/busybox/stuff/busybox-1.12.0-zmodules.u	Thu Oct 23 20:39:58 2008 +0000
     1.2 +++ b/busybox/stuff/busybox-1.12.0-zmodules.u	Fri Mar 12 13:33:45 2010 +0100
     1.3 @@ -50,7 +50,7 @@
     1.4   #include <libgen.h>
     1.5   #include <sys/utsname.h>
     1.6   
     1.7 -@@ -4212,6 +4213,48 @@ static const char *moderror(int err)
     1.8 +@@ -4212,6 +4213,60 @@ static const char *moderror(int err)
     1.9   	}
    1.10   }
    1.11   
    1.12 @@ -67,22 +67,34 @@
    1.13  +	if (fd < 0) return NULL;
    1.14  +	xread(fd,head,sizeof(head));
    1.15  +	lseek(fd,0L,SEEK_SET);
    1.16 ++#if ENABLE_FEATURE_SEAMLESS_GZ
    1.17  +	if (head[0] == 0x1f && head[1] == 0x8b) { /* gzip */
    1.18  +#if BB_MMU
    1.19  +		xread(fd,head,2); // bb wierdness...
    1.20  +#endif
    1.21  +		open_transformer(fd, unpack_gz_stream, "gunzip");
    1.22  +	}
    1.23 -+	else if (head[0] == 'B' && head[1] == 'Z' && 
    1.24 ++#endif
    1.25 ++#if ENABLE_FEATURE_SEAMLESS_BZ2
    1.26 ++#if ENABLE_FEATURE_SEAMLESS_GZ
    1.27 ++	else
    1.28 ++#endif
    1.29 ++	if (head[0] == 'B' && head[1] == 'Z' && 
    1.30  +			 head[2] == 'h' && isdigit(head[3])) { /* bzip2 */
    1.31  +		open_transformer(fd, unpack_bz2_stream, "bunzip2");
    1.32  +	}
    1.33 -+	else if (head[1] != 'E' || head[2] != 'L' || head[3] != 'F') {
    1.34 ++#endif
    1.35 ++#if ENABLE_FEATURE_SEAMLESS_LZMA
    1.36 ++#if ENABLE_FEATURE_SEAMLESS_GZ || ENABLE_FEATURE_SEAMLESS_BZ2
    1.37 ++	else
    1.38 ++#endif
    1.39 ++	if (head[1] != 'E' || head[2] != 'L' || head[3] != 'F') {
    1.40  +		open_transformer(fd, unpack_lzma_stream, "unlzma");
    1.41  +		if (* (unsigned *) (head + 9) == 0)
    1.42  +			max = 1 + head[5] + (head[6]<<8) 
    1.43  +				+ (head[7]<<16) + (head[8]<<24);
    1.44  +	}
    1.45 ++#endif
    1.46  +	l = 0;
    1.47  +	map = xmalloc(max);
    1.48  +	while (1) {
    1.49 @@ -99,7 +111,7 @@
    1.50   #if !ENABLE_FEATURE_2_4_MODULES
    1.51   int insmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
    1.52   int insmod_main(int argc UNUSED_PARAM, char **argv)
    1.53 -@@ -4264,8 +4307,7 @@ static int insmod_ng_main(int argc UNUSE
    1.54 +@@ -4276,8 +4319,7 @@ static int insmod_ng_main(int argc UNUSE
    1.55   		xread(fd, map, len);
    1.56   	}
    1.57   #else