Merge branch 'master' of git://git.denx.de/u-boot-i2c

[karo-tx-uboot.git] / lib / gunzip.c

diff --git a/lib/gunzip.c b/lib/gunzip.c
index 482a4768a3f9afd9fa4d24b8927c615e892c561f..35abfb38e176ff64b621fbe9d91b3542ce8150cd 100644 (file)
--- a/lib/gunzip.c
+++ b/lib/gunzip.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2000-2006
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -36,10 +20,7 @@
 #define RESERVED               0xe0
 #define DEFLATED               8
 
-void *zalloc(void *, unsigned, unsigned);
-void zfree(void *, void *, unsigned);
-
-void *zalloc(void *x, unsigned items, unsigned size)
+void *gzalloc(void *x, unsigned items, unsigned size)
 {
        void *p;
 
@@ -51,7 +32,7 @@ void *zalloc(void *x, unsigned items, unsigned size)
        return (p);
 }
 
-void zfree(void *x, void *addr, unsigned nb)
+void gzfree(void *x, void *addr, unsigned nb)
 {
        free (addr);
 }
@@ -94,8 +75,8 @@ int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp,
        z_stream s;
        int r;
 
-       s.zalloc = zalloc;
-       s.zfree = zfree;
+       s.zalloc = gzalloc;
+       s.zfree = gzfree;
 
        r = inflateInit2(&s, -MAX_WBITS);
        if (r != Z_OK) {
@@ -106,12 +87,16 @@ int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp,
        s.avail_in = *lenp - offset;
        s.next_out = dst;
        s.avail_out = dstlen;
-       r = inflate(&s, Z_FINISH);
-       if ((r != Z_STREAM_END) && (stoponerr==1)) {
-               printf ("Error: inflate() returned %d\n", r);
-               inflateEnd(&s);
-               return (-1);
-       }
+       do {
+               r = inflate(&s, Z_FINISH);
+               if (stoponerr == 1 && r != Z_STREAM_END &&
+                   (s.avail_out == 0 || r != Z_BUF_ERROR)) {
+                       printf("Error: inflate() returned %d\n", r);
+                       inflateEnd(&s);
+                       return -1;
+               }
+               s.avail_in = *lenp - offset - (int)(s.next_out - (unsigned char*)dst);
+       } while (r == Z_BUF_ERROR);
        *lenp = s.next_out - (unsigned char *) dst;
        inflateEnd(&s);