From mboxrd@z Thu Jan  1 00:00:00 1970
From: Sergei Shtylyov <sshtylyov@mvista.com>
Date: Thu, 03 Feb 2011 15:57:01 +0300
Subject: [U-Boot] [PATCH] Fix gunzip to work for any gzipped uImage size
 Signed-off-by: Catalin Radu <Catalin@VirtualMetrix.com>
In-Reply-To: <1296664907-2185-1-git-send-email-Catalin@VirtualMetrix.com>
References: <1296664907-2185-1-git-send-email-Catalin@VirtualMetrix.com>
Message-ID: <4D4AA61D.8040707@mvista.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Hello.

On 02-02-2011 19:41, Catalin Radu wrote:

> diff --git a/lib/gunzip.c b/lib/gunzip.c
> index 482a476..18cb45b 100644
> --- a/lib/gunzip.c
> +++ b/lib/gunzip.c
> @@ -106,12 +106,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 ((r != Z_STREAM_END)&&  (r != Z_BUF_ERROR)&&  (stoponerr==1)) {
> +            printf ("Error: inflate() returned %d\n", r);
> +            inflateEnd(&s);
> +            return (-1);
> +        }
> +        s.avail_in = *lenp - offset - (int)(s.next_out - (unsigned char*)dst);
> +        s.avail_out = dstlen;
> +    } while (r == Z_BUF_ERROR);

    Don't use spaces for indenting, only tabs.

WBR, Sergei