On Friday 24 April 2009, Ricardo Ribalda Delgado wrote:
> Blocks compressed with zlib are not handled correctly.
> gunzip decompress blocks with the gzip header, but ubi blocks
> dont have header.
> ---
Again, Signed-off-by missing.
More comments below.
> fs/ubifs/ubifs.c | 43 ++++++++++++++++++++++++++++++++++++++++++-
> fs/ubifs/ubifs.h | 2 --
> 2 files changed, 42 insertions(+), 3 deletions(-)
>
> diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c
> index 32f9ff8..0708d90 100644
> --- a/fs/ubifs/ubifs.c
> +++ b/fs/ubifs/ubifs.c
> @@ -24,6 +24,7 @@
> */
>
> #include "ubifs.h"
> +#include <u-boot/zlib.h>
>
> #if !defined(CONFIG_SYS_64BIT_VSPRINTF)
> #warning Please define CONFIG_SYS_64BIT_VSPRINTF for correct output!
> @@ -33,6 +34,10 @@ DECLARE_GLOBAL_DATA_PTR;
>
> /* compress.c */
>
> +int ubi_gunzip(void *dst, int dstlen, unsigned char *src, unsigned long
> *lenp); +void *zalloc(void *, unsigned, unsigned);
> +void zfree(void *, void *, unsigned);
> +
> /*
> * We need a wrapper for gunzip() because the parameters are
> * incompatible with the lzo decompressor.
> @@ -41,7 +46,7 @@ static int gzip_decompress(const unsigned char *in,
> size_t in_len, unsigned char *out, size_t *out_len)
> {
> unsigned long len = in_len;
> - return gunzip(out, *out_len, (unsigned char *)in, &len);
> + return ubi_gunzip(out, *out_len, (unsigned char *)in, &len);
> }
>
> /* Fake description object for the "none" compressor */
> @@ -685,3 +690,39 @@ out:
> ubi_close_volume(c->ubi);
> return err;
> }
> +
> +int ubi_gunzip(void *dst, int dstlen, unsigned char *src, unsigned long
> *lenp) +{
> + z_stream s;
> + int r, i, flags;
> + i=0;
> +
> + s.zalloc = zalloc;
> + s.zfree = zfree;
> +#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
> + s.outcb = (cb_func)WATCHDOG_RESET;
> +#else
> + s.outcb = Z_NULL;
> +#endif /* CONFIG_HW_WATCHDOG */
> +
> + r = inflateInit2(&s, -MAX_WBITS);
> + if (r != Z_OK) {
> + printf ("Error: inflateInit2() returned %d\n", r);
> + return (-1);
> + }
> + s.next_in = src + i;
> + s.avail_in = *lenp - i;
> + s.next_out = dst;
> + s.avail_out = dstlen;
> + r = inflate(&s, Z_FINISH);
> + if (r != Z_STREAM_END) {
> + //printf ("Error: inflate() returned %d\n", r);
> + //inflateEnd(&s);
> + //return (-1);
> + }
Hmmm? Either do something in this if path or remove it completely.
Thanks.
Best regards,
Stefan
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
_______________________________________________
U-Boot mailing list
[email protected]
http://lists.denx.de/mailman/listinfo/u-boot
