summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
ccb71df)
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>
int gunzip(void *, int, unsigned char *, unsigned long *);
void *zalloc(void *, unsigned, unsigned);
void zfree(void *, void *, unsigned);
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)
{
void *zalloc(void *x, unsigned items, unsigned size)
{
int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp)
{
int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp)
{
- z_stream s;
- int r, i, flags;
/* skip header */
i = 10;
/* skip header */
i = 10;
+ 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)
s.zalloc = zalloc;
s.zfree = zfree;
#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
r = inflateInit2(&s, -MAX_WBITS);
if (r != Z_OK) {
printf ("Error: inflateInit2() returned %d\n", r);
r = inflateInit2(&s, -MAX_WBITS);
if (r != Z_OK) {
printf ("Error: inflateInit2() returned %d\n", r);
- 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);
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);
printf ("Error: inflate() returned %d\n", r);
inflateEnd(&s);
return (-1);
*lenp = s.next_out - (unsigned char *) dst;
inflateEnd(&s);
*lenp = s.next_out - (unsigned char *) dst;
inflateEnd(&s);