summaryrefslogtreecommitdiff
path: root/lib_generic/gunzip.c
diff options
context:
space:
mode:
authorRicardo Ribalda Delgado <ricardo.ribalda@uam.es>2009-04-27 18:33:32 +0200
committerWolfgang Denk <wd@denx.de>2009-04-30 23:07:02 +0200
commit35f6a943f7d92145d607c1d55f5c2e2eae5be630 (patch)
tree84de84b4681760b3b9f3fb40b366c90c8af99f25 /lib_generic/gunzip.c
parentccb71dfac94d4a9ef161a59a51b4f31d7d9e4747 (diff)
lib_generic: gunzip: New function zunzip
Separate gunzip in gunzip: Find the end of the header and call zunzip. zunzip: Inflate gunzip block without header. UBI fs blocks can be compresed in lzo, zlib or no-compression. The current implementation of u-boot supported all the compressions but there was a bug in the implementation of the zlib blocks. UBIFS's Zlib blocks do not have header but they were compressed using gunzip, a function used to decompress gunzip files/sectors with a header. This patch adds a new function zunzip that uncompress a zlib block with no header. Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@uam.es>
Diffstat (limited to 'lib_generic/gunzip.c')
-rw-r--r--lib_generic/gunzip.c27
1 files changed, 20 insertions, 7 deletions
diff --git a/lib_generic/gunzip.c b/lib_generic/gunzip.c
index 01a4031a64e..d59a4482b73 100644
--- a/lib_generic/gunzip.c
+++ b/lib_generic/gunzip.c
@@ -39,6 +39,8 @@
int gunzip(void *, int, unsigned char *, unsigned long *);
void *zalloc(void *, unsigned, unsigned);
void zfree(void *, void *, unsigned);
+int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp,
+ int stoponerr, int offset);
void *zalloc(void *x, unsigned items, unsigned size)
{
@@ -59,8 +61,7 @@ void zfree(void *x, void *addr, unsigned nb)
int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp)
{
- z_stream s;
- int r, i, flags;
+ int i, flags;
/* skip header */
i = 10;
@@ -84,6 +85,18 @@ int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp)
return (-1);
}
+ return zunzip(dst, dstlen, src, lenp, 1, i);
+}
+
+/*
+ * Uncompress blocks compressed with zlib without headers
+ */
+int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp,
+ int stoponerr, int offset)
+{
+ z_stream s;
+ int r;
+
s.zalloc = zalloc;
s.zfree = zfree;
#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
@@ -95,14 +108,14 @@ int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp)
r = inflateInit2(&s, -MAX_WBITS);
if (r != Z_OK) {
printf ("Error: inflateInit2() returned %d\n", r);
- return (-1);
+ return -1;
}
- s.next_in = src + i;
- s.avail_in = *lenp - i;
+ s.next_in = src + offset;
+ s.avail_in = *lenp - offset;
s.next_out = dst;
s.avail_out = dstlen;
r = inflate(&s, Z_FINISH);
- if (r != Z_STREAM_END) {
+ if ((r != Z_STREAM_END) && (stoponerr==1)) {
printf ("Error: inflate() returned %d\n", r);
inflateEnd(&s);
return (-1);
@@ -110,5 +123,5 @@ int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp)
*lenp = s.next_out - (unsigned char *) dst;
inflateEnd(&s);
- return (0);
+ return 0;
}