# HG changeset patch # User Pascal Bellard # Date 1221837871 0 # Node ID ce72aad145d44d50593ce5cefb1d0855d5ac83cd # Parent ccf334bab9369cfb2badb575da846e854eb9e267 busybox: fix gzipped module insertion diff -r ccf334bab936 -r ce72aad145d4 busybox/stuff/busybox-1.12.0-zmodules.u --- a/busybox/stuff/busybox-1.12.0-zmodules.u Thu Sep 18 12:42:13 2008 +0200 +++ b/busybox/stuff/busybox-1.12.0-zmodules.u Fri Sep 19 15:24:31 2008 +0000 @@ -50,7 +50,7 @@ #include #include -@@ -4212,6 +4213,45 @@ static const char *moderror(int err) +@@ -4212,6 +4213,48 @@ static const char *moderror(int err) } } @@ -68,6 +68,9 @@ + xread(fd,head,sizeof(head)); + lseek(fd,0L,SEEK_SET); + if (head[0] == 0x1f && head[1] == 0x8b) { /* gzip */ ++#if BB_MMU ++ xread(fd,head,2); // bb wierdness... ++#endif + open_transformer(fd, unpack_gz_stream, "gunzip"); + } + else if (head[0] == 'B' && head[1] == 'Z' && @@ -96,7 +99,7 @@ #if !ENABLE_FEATURE_2_4_MODULES int insmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int insmod_main(int argc UNUSED_PARAM, char **argv) -@@ -4264,8 +4304,7 @@ static int insmod_ng_main(int argc UNUSE +@@ -4264,8 +4307,7 @@ static int insmod_ng_main(int argc UNUSE xread(fd, map, len); } #else