X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Flibunarchive%2Fdecompress_unzip.c;h=621d84c2d51ff97ef20fd07538fa9ffc60ed0582;hb=714701c890b5f03253c5ecdb7367c4258ce78715;hp=046f4dd728d3a646d5eb1b80db479225140c59e7;hpb=fd73b8c2ce6ae9517e37127cba2a48a6ee803287;p=oweals%2Fbusybox.git diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c index 046f4dd72..621d84c2d 100644 --- a/archival/libunarchive/decompress_unzip.c +++ b/archival/libunarchive/decompress_unzip.c @@ -7,27 +7,19 @@ * Originally adjusted for busybox by Sven Rudolph * based on gzip sources * - * Adjusted further by Erik Andersen to support + * Adjusted further by Erik Andersen to support * files as well as stdin/stdout, and to generally behave itself wrt * command line handling. * * General cleanup to better adhere to the style guide and make use of standard - * busybox functions by Glenn McGrath - * - * 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. + * busybox functions by Glenn McGrath * - * 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 + * read_gz interface + associated hacking by Laurence Anderson * + * Fixed huft_build() so decoding end-of-block code does not grab more bits + * than necessary (this is required by unzip applet), added inflate_cleanup() + * to free leaked bytebuffer memory (used in unzip.c), and some minor style + * guide cleanups by Ed Clark * * gzip (GNU zip) -- compress files with zip algorithm and 'compress' interface * Copyright (C) 1992-1993 Jean-loup Gailly @@ -36,39 +28,12 @@ * written by Spencer Thomas, Joe Orost, James Woods, Jim McKie, Steve Davies, * Ken Turkowski, Dave Mack and Peter Jannesen. * - * See the license_msg below and the file COPYING for the software license. * See the file algorithm.doc for the compression algorithms and file formats. + * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#if 0 -static char *license_msg[] = { - " Copyright (C) 1992-1993 Jean-loup Gailly", - " 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, 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., 675 Mass Ave, Cambridge, MA 02139, USA.", - 0 -}; -#endif - -#include -#include -#include -#include -#include -#include -#include -#include "config.h" -#include "busybox.h" +#include "libbb.h" #include "unarchive.h" typedef struct huft_s { @@ -84,31 +49,28 @@ static int gunzip_src_fd; unsigned int gunzip_bytes_out; /* number of output bytes */ static unsigned int gunzip_outbuf_count; /* bytes in output buffer */ -/* This is used to sanify any unused bits from the bitbuffer - * so they arent skipped when reading trailers (trailing headers) */ -unsigned char gunzip_in_buffer_count; -unsigned char *gunzip_in_buffer; - /* gunzip_window size--must be a power of two, and * at least 32K for zip's deflate method */ -static const int gunzip_wsize = 0x8000; -static int output_buffer_size = 0x8000; // gunzip_wsize initially - +enum { gunzip_wsize = 0x8000 }; static unsigned char *gunzip_window; -static unsigned int *gunzip_crc_table; -unsigned int gunzip_crc; -static unsigned char *output_buffer; -static unsigned int output_buffer_len; +static uint32_t *gunzip_crc_table; +uint32_t gunzip_crc; /* If BMAX needs to be larger than 16, then h and x[] should be ulg. */ #define BMAX 16 /* maximum bit length of any code (16 for explode) */ #define N_MAX 288 /* maximum number of codes in any set */ -static unsigned int gunzip_hufts; /* track memory usage */ +/* bitbuffer */ static unsigned int gunzip_bb; /* bit buffer */ static unsigned char gunzip_bk; /* bits in bit buffer */ +/* These control the size of the bytebuffer */ +static unsigned int bytebuffer_max = 0x8000; +static unsigned char *bytebuffer = NULL; +static unsigned int bytebuffer_offset = 0; +static unsigned int bytebuffer_size = 0; + static const unsigned short mask_bits[] = { 0x0000, 0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff, 0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff @@ -117,26 +79,26 @@ static const unsigned short mask_bits[] = { /* Copy lengths for literal codes 257..285 */ static const unsigned short cplens[] = { 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, - 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0 + 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0 }; /* note: see note #13 above about the 258 in this list. */ /* Extra bits for literal codes 257..285 */ static const unsigned char cplext[] = { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, - 5, 5, 5, 0, 99, 99 + 5, 5, 5, 0, 99, 99 }; /* 99==invalid */ /* Copy offsets for distance codes 0..29 */ static const unsigned short cpdist[] = { 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, - 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577 + 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577 }; /* Extra bits for distance codes */ static const unsigned char cpdext[] = { 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, - 11, 11, 12, 12, 13, 13 + 11, 11, 12, 12, 13, 13 }; /* Tables for deflate from PKZIP's appnote.txt. */ @@ -148,52 +110,26 @@ static const unsigned char border[] = { static unsigned int fill_bitbuffer(unsigned int bitbuffer, unsigned int *current, const unsigned int required) { while (*current < required) { - bitbuffer |= ((unsigned int) xread_char(gunzip_src_fd)) << *current; + if (bytebuffer_offset >= bytebuffer_size) { + /* Leave the first 4 bytes empty so we can always unwind the bitbuffer + * to the front of the bytebuffer, leave 4 bytes free at end of tail + * so we can easily top up buffer in check_trailer_gzip() */ + if (1 > (bytebuffer_size = safe_read(gunzip_src_fd, &bytebuffer[4], bytebuffer_max - 8))) + bb_error_msg_and_die("unexpected end of file"); + bytebuffer_size += 4; + bytebuffer_offset = 4; + } + bitbuffer |= ((unsigned int) bytebuffer[bytebuffer_offset]) << *current; + bytebuffer_offset++; *current += 8; } - - return(bitbuffer); -} - -static void abort_gzip(void) -{ - error_msg("gzip aborted\n"); - exit(-1); -} - -static void make_gunzip_crc_table(void) -{ - const unsigned int poly = 0xedb88320; /* polynomial exclusive-or pattern */ - unsigned short i; /* counter for all possible eight bit values */ - - /* initial shift register value */ - gunzip_crc = 0xffffffffL; - gunzip_crc_table = (unsigned int *) malloc(256 * sizeof(unsigned int)); - - /* Compute and print table of CRC's, five per line */ - for (i = 0; i < 256; i++) { - unsigned int table_entry; /* crc shift register */ - unsigned char k; /* byte being shifted into crc apparatus */ - - table_entry = i; - /* The idea to initialize the register with the byte instead of - * zero was stolen from Haruhiko Okumura's ar002 - */ - for (k = 8; k; k--) { - if (table_entry & 1) { - table_entry = (table_entry >> 1) ^ poly; - } else { - table_entry >>= 1; - } - } - gunzip_crc_table[i] = table_entry; - } + return bitbuffer; } /* * Free the malloc'ed tables built by huft_build(), which makes a linked * list of the tables it made, with the links in a dummy first entry of - * each table. + * each table. * t: table to free */ static int huft_free(huft_t * t) @@ -225,70 +161,60 @@ static int huft_free(huft_t * t) * t: result: starting table * m: maximum lookup bits, returns actual */ -static int huft_build(unsigned int *b, const unsigned int n, - const unsigned int s, const unsigned short *d, - const unsigned char *e, huft_t ** t, int *m) +static +int huft_build(unsigned int *b, const unsigned int n, + const unsigned int s, const unsigned short *d, + const unsigned char *e, huft_t ** t, unsigned int *m) { - unsigned a; /* counter for codes of length k */ + unsigned a; /* counter for codes of length k */ unsigned c[BMAX + 1]; /* bit length count table */ - unsigned f; /* i repeats in table every f entries */ - int g; /* maximum code length */ - int h; /* table level */ - register unsigned i; /* counter, current code */ - register unsigned j; /* counter */ - register int k; /* number of bits in current code */ - int l; /* bits per table (returned in m) */ - register unsigned *p; /* pointer into c[], b[], or v[] */ - register huft_t *q; /* points to current table */ - huft_t r; /* table entry for structure assignment */ - huft_t *u[BMAX]; /* table stack */ - unsigned v[N_MAX]; /* values in order of bit length */ - register int w; /* bits before this table == (l * h) */ + unsigned eob_len; /* length of end-of-block code (value 256) */ + unsigned f; /* i repeats in table every f entries */ + int g; /* maximum code length */ + int htl; /* table level */ + unsigned i; /* counter, current code */ + unsigned j; /* counter */ + int k; /* number of bits in current code */ + unsigned *p; /* pointer into c[], b[], or v[] */ + huft_t *q; /* points to current table */ + huft_t r; /* table entry for structure assignment */ + huft_t *u[BMAX]; /* table stack */ + unsigned v[N_MAX]; /* values in order of bit length */ + int ws[BMAX+1]; /* bits decoded stack */ + int w; /* bits decoded */ unsigned x[BMAX + 1]; /* bit offsets, then code stack */ - unsigned *xp; /* pointer into x */ - int y; /* number of dummy codes added */ - unsigned z; /* number of entries in current table */ + unsigned *xp; /* pointer into x */ + int y; /* number of dummy codes added */ + unsigned z; /* number of entries in current table */ + + /* Length of EOB code, if any */ + eob_len = n > 256 ? b[256] : BMAX; /* Generate counts for each bit length */ - memset((void *) (c), 0, sizeof(c)); + memset((void *)c, 0, sizeof(c)); p = b; i = n; do { - c[*p]++; /* assume all entries <= BMAX */ - p++; /* Can't combine with above line (Solaris bug) */ + c[*p]++; /* assume all entries <= BMAX */ + p++; /* Can't combine with above line (Solaris bug) */ } while (--i); - if (c[0] == n) { /* null input--all zero length codes */ + if (c[0] == n) { /* null input--all zero length codes */ *t = (huft_t *) NULL; *m = 0; - return 0; + return 2; } /* Find minimum and maximum length, bound *m by those */ - l = *m; - for (j = 1; j <= BMAX; j++) { - if (c[j]) { - break; - } - } - k = j; /* minimum code length */ - if ((unsigned) l < j) { - l = j; - } - for (i = BMAX; i; i--) { - if (c[i]) { - break; - } - } - g = i; /* maximum code length */ - if ((unsigned) l > i) { - l = i; - } - *m = l; + for (j = 1; (c[j] == 0) && (j <= BMAX); j++); + k = j; /* minimum code length */ + for (i = BMAX; (c[i] == 0) && i; i--); + g = i; /* maximum code length */ + *m = (*m < j) ? j : ((*m > i) ? i : *m); /* Adjust last length count to fill out codes, if needed */ for (y = 1 << j; j < i; j++, y <<= 1) { if ((y -= c[j]) < 0) { - return 2; /* bad input: more codes than bits */ + return 2; /* bad input: more codes than bits */ } } if ((y -= c[i]) < 0) { @@ -300,7 +226,7 @@ static int huft_build(unsigned int *b, const unsigned int n, x[1] = j = 0; p = c + 1; xp = x + 2; - while (--i) { /* note that i == g from above */ + while (--i) { /* note that i == g from above */ *xp++ = (j += *p++); } @@ -314,13 +240,13 @@ static int huft_build(unsigned int *b, const unsigned int n, } while (++i < n); /* Generate the Huffman codes and for each, make the table entries */ - x[0] = i = 0; /* first Huffman code is zero */ - p = v; /* grab values in bit order */ - h = -1; /* no tables yet--level -1 */ - w = -l; /* bits decoded == (l * h) */ + x[0] = i = 0; /* first Huffman code is zero */ + p = v; /* grab values in bit order */ + htl = -1; /* no tables yet--level -1 */ + w = ws[0] = 0; /* bits decoded */ u[0] = (huft_t *) NULL; /* just to keep compilers happy */ q = (huft_t *) NULL; /* ditto */ - z = 0; /* ditto */ + z = 0; /* ditto */ /* go through the bit lengths (k already is bits in shortest code) */ for (; k <= g; k++) { @@ -328,53 +254,52 @@ static int huft_build(unsigned int *b, const unsigned int n, while (a--) { /* here i is the Huffman code of length k bits for value *p */ /* make tables up to required level */ - while (k > w + l) { - h++; - w += l; /* previous table always l bits */ - - /* compute minimum size table less than or equal to l bits */ - z = (z = g - w) > (unsigned) l ? l : z; /* upper limit on table size */ - if ((f = 1 << (j = k - w)) > a + 1) { /* try a k-w bit table *//* too few codes for k-w bit table */ - f -= a + 1; /* deduct codes from patterns left */ + while (k > ws[htl + 1]) { + w = ws[++htl]; + + /* compute minimum size table less than or equal to *m bits */ + z = (z = g - w) > *m ? *m : z; /* upper limit on table size */ + if ((f = 1 << (j = k - w)) > a + 1) { /* try a k-w bit table */ + /* too few codes for k-w bit table */ + f -= a + 1; /* deduct codes from patterns left */ xp = c + k; - while (++j < z) { /* try smaller tables up to z bits */ + while (++j < z) { /* try smaller tables up to z bits */ if ((f <<= 1) <= *++xp) { - break; /* enough codes to use up j bits */ + break; /* enough codes to use up j bits */ } - f -= *xp; /* else deduct codes from patterns */ + f -= *xp; /* else deduct codes from patterns */ } } + j = (w + j > eob_len && w < eob_len) ? eob_len - w : j; /* make EOB code end at table */ z = 1 << j; /* table entries for j-bit table */ + ws[htl+1] = w + j; /* set bits decoded in stack */ /* allocate and link in new table */ - q = (huft_t *) xmalloc((z + 1) * sizeof(huft_t)); - - gunzip_hufts += z + 1; /* track memory usage */ + q = (huft_t *) xzalloc((z + 1) * sizeof(huft_t)); *t = q + 1; /* link to list for huft_free() */ - *(t = &(q->v.t)) = NULL; - u[h] = ++q; /* table starts after link */ + t = &(q->v.t); + u[htl] = ++q; /* table starts after link */ /* connect to last table, if there is one */ - if (h) { - x[h] = i; /* save pattern for backing up */ - r.b = (unsigned char) l; /* bits to dump before this table */ - r.e = (unsigned char) (16 + j); /* bits in this table */ - r.v.t = q; /* pointer to this table */ - j = i >> (w - l); /* (get around Turbo C bug) */ - u[h - 1][j] = r; /* connect to last table */ + if (htl) { + x[htl] = i; /* save pattern for backing up */ + r.b = (unsigned char) (w - ws[htl - 1]); /* bits to dump before this table */ + r.e = (unsigned char) (16 + j); /* bits in this table */ + r.v.t = q; /* pointer to this table */ + j = (i & ((1 << w) - 1)) >> ws[htl - 1]; + u[htl - 1][j] = r; /* connect to last table */ } } /* set up table entry in r */ r.b = (unsigned char) (k - w); if (p >= v + n) { - r.e = 99; /* out of values--invalid code */ + r.e = 99; /* out of values--invalid code */ } else if (*p < s) { - r.e = (unsigned char) (*p < 256 ? 16 : 15); /* 256 is end-of-block code */ - r.v.n = (unsigned short) (*p); /* simple code is just the value */ - p++; /* one compiler does not like *p++ */ + r.e = (unsigned char) (*p < 256 ? 16 : 15); /* 256 is EOB code */ + r.v.n = (unsigned short) (*p++); /* simple code is just the value */ } else { - r.e = (unsigned char) e[*p - s]; /* non-simple--look up in lists */ + r.e = (unsigned char) e[*p - s]; /* non-simple--look up in lists */ r.v.n = d[*p++ - s]; } @@ -391,44 +316,17 @@ static int huft_build(unsigned int *b, const unsigned int n, i ^= j; /* backup over finished tables */ - while ((i & ((1 << w) - 1)) != x[h]) { - h--; /* don't need to update q */ - w -= l; + while ((i & ((1 << w) - 1)) != x[htl]) { + w = ws[--htl]; } } } - /* Return true (1) if we were given an incomplete table */ - return y != 0 && g != 1; -} -/* =========================================================================== - * Write the output gunzip_window gunzip_window[0..gunzip_outbuf_count-1] and update crc and gunzip_bytes_out. - * (Used for the decompressed data only.) - */ -static void flush_gunzip_window(void) -{ - int n; + /* return actual size of base table */ + *m = ws[1]; - for (n = 0; n < gunzip_outbuf_count; n++) { - gunzip_crc = gunzip_crc_table[((int) gunzip_crc ^ (gunzip_window[n])) & 0xff] ^ (gunzip_crc >> 8); - } - - if (output_buffer_len == 0) { // Our buffer is empty -> straight memcpy - memcpy(output_buffer, gunzip_window, gunzip_outbuf_count); - output_buffer_len = gunzip_outbuf_count; - } else { // Bit more complicated, append to end of output_buffer, realloc as necessary - int newlen = output_buffer_len + gunzip_outbuf_count; - if (newlen > output_buffer_size) { - output_buffer = xrealloc(output_buffer, newlen); // Could free later, but as we now have the memory... - //printf("Using %d byte output buffer\n", newlen); - output_buffer_size = newlen; - } - memcpy(output_buffer + output_buffer_len, gunzip_window, gunzip_outbuf_count); - output_buffer_len += gunzip_outbuf_count; - } - - gunzip_bytes_out += gunzip_outbuf_count; - gunzip_outbuf_count = 0; + /* Return true (1) if we were given an incomplete table */ + return y != 0 && g != 1; } /* @@ -438,30 +336,43 @@ static void flush_gunzip_window(void) * tl, td: literal/length and distance decoder tables * bl, bd: number of bits decoded by tl[] and td[] */ -static int inflate_codes(huft_t * tl, huft_t * td, const unsigned int bl, const unsigned int bd) +static int inflate_codes(huft_t * my_tl, huft_t * my_td, const unsigned int my_bl, const unsigned int my_bd, int setup) { - unsigned int e; /* table entry flag/number of extra bits */ - unsigned int n, d; /* length and index for copy */ - unsigned int w; /* current gunzip_window position */ - huft_t *t; /* pointer to table entry */ - unsigned int ml, md; /* masks for bl and bd bits */ - unsigned int b; /* bit buffer */ - unsigned int k; /* number of bits in bit buffer */ + static unsigned int e; /* table entry flag/number of extra bits */ + static unsigned int n, d; /* length and index for copy */ + static unsigned int w; /* current gunzip_window position */ + static huft_t *t; /* pointer to table entry */ + static unsigned int ml, md; /* masks for bl and bd bits */ + static unsigned int b; /* bit buffer */ + static unsigned int k; /* number of bits in bit buffer */ + static huft_t *tl, *td; + static unsigned int bl, bd; + static int resumeCopy = 0; + + if (setup) { // 1st time we are called, copy in variables + tl = my_tl; + td = my_td; + bl = my_bl; + bd = my_bd; + /* make local copies of globals */ + b = gunzip_bb; /* initialize bit buffer */ + k = gunzip_bk; + w = gunzip_outbuf_count; /* initialize gunzip_window position */ + + /* inflate the coded data */ + ml = mask_bits[bl]; /* precompute masks for speed */ + md = mask_bits[bd]; + return 0; // Don't actually do anything the first time + } - /* make local copies of globals */ - b = gunzip_bb; /* initialize bit buffer */ - k = gunzip_bk; - w = gunzip_outbuf_count; /* initialize gunzip_window position */ + if (resumeCopy) goto do_copy; - /* inflate the coded data */ - ml = mask_bits[bl]; /* precompute masks for speed */ - md = mask_bits[bd]; while (1) { /* do until end of block */ b = fill_bitbuffer(b, &k, bl); if ((e = (t = tl + ((unsigned) b & ml))->e) > 16) do { if (e == 99) { - return 1; + bb_error_msg_and_die("inflate_codes error 1"); } b >>= t->b; k -= t->b; @@ -475,8 +386,9 @@ static int inflate_codes(huft_t * tl, huft_t * td, const unsigned int bl, const gunzip_window[w++] = (unsigned char) t->v.n; if (w == gunzip_wsize) { gunzip_outbuf_count = (w); - flush_gunzip_window(); + //flush_gunzip_window(); w = 0; + return 1; // We have a block to read } } else { /* it's an EOB or a length */ @@ -496,7 +408,7 @@ static int inflate_codes(huft_t * tl, huft_t * td, const unsigned int bl, const if ((e = (t = td + ((unsigned) b & md))->e) > 16) do { if (e == 99) - return 1; + bb_error_msg_and_die("inflate_codes error 2"); b >>= t->b; k -= t->b; e -= 16; @@ -512,7 +424,7 @@ static int inflate_codes(huft_t * tl, huft_t * td, const unsigned int bl, const k -= e; /* do the copy */ - do { +do_copy: do { n -= (e = (e = gunzip_wsize - ((d &= gunzip_wsize - 1) > w ? d : w)) > n ? n : e); @@ -530,11 +442,14 @@ static int inflate_codes(huft_t * tl, huft_t * td, const unsigned int bl, const } if (w == gunzip_wsize) { gunzip_outbuf_count = (w); - flush_gunzip_window(); + if (n) resumeCopy = 1; + else resumeCopy = 0; + //flush_gunzip_window(); w = 0; + return 1; } - } while (n); + resumeCopy = 0; } } @@ -543,20 +458,60 @@ static int inflate_codes(huft_t * tl, huft_t * td, const unsigned int bl, const gunzip_bb = b; /* restore global bit buffer */ gunzip_bk = k; + /* normally just after call to inflate_codes, but save code by putting it here */ + /* free the decoding tables, return */ + huft_free(tl); + huft_free(td); + /* done */ return 0; } +static int inflate_stored(int my_n, int my_b_stored, int my_k_stored, int setup) +{ + static unsigned int n, b_stored, k_stored, w; + if (setup) { + n = my_n; + b_stored = my_b_stored; + k_stored = my_k_stored; + w = gunzip_outbuf_count; /* initialize gunzip_window position */ + return 0; // Don't do anything first time + } + + /* read and output the compressed data */ + while (n--) { + b_stored = fill_bitbuffer(b_stored, &k_stored, 8); + gunzip_window[w++] = (unsigned char) b_stored; + if (w == gunzip_wsize) { + gunzip_outbuf_count = (w); + //flush_gunzip_window(); + w = 0; + b_stored >>= 8; + k_stored -= 8; + return 1; // We have a block + } + b_stored >>= 8; + k_stored -= 8; + } + + /* restore the globals from the locals */ + gunzip_outbuf_count = w; /* restore global gunzip_window pointer */ + gunzip_bb = b_stored; /* restore global bit buffer */ + gunzip_bk = k_stored; + return 0; // Finished +} + /* * decompress an inflated block * e: last block flag * * GLOBAL VARIABLES: bb, kk, */ + // Return values: -1 = inflate_stored, -2 = inflate_codes static int inflate_block(int *e) { unsigned t; /* block type */ - register unsigned int b; /* bit buffer */ + unsigned int b; /* bit buffer */ unsigned int k; /* number of bits in bit buffer */ /* make local bit buffer */ @@ -585,14 +540,12 @@ static int inflate_block(int *e) case 0: /* Inflate stored */ { unsigned int n; /* number of bytes in block */ - unsigned int w; /* current gunzip_window position */ unsigned int b_stored; /* bit buffer */ unsigned int k_stored; /* number of bits in bit buffer */ /* make local copies of globals */ b_stored = gunzip_bb; /* initialize bit buffer */ k_stored = gunzip_bk; - w = gunzip_outbuf_count; /* initialize gunzip_window position */ /* go to byte boundary */ n = k_stored & 7; @@ -612,26 +565,10 @@ static int inflate_block(int *e) b_stored >>= 16; k_stored -= 16; - /* read and output the compressed data */ - while (n--) { - b_stored = fill_bitbuffer(b_stored, &k_stored, 8); - gunzip_window[w++] = (unsigned char) b_stored; - if (w == (unsigned int) gunzip_wsize) { - gunzip_outbuf_count = (w); - flush_gunzip_window(); - w = 0; - } - b_stored >>= 8; - k_stored -= 8; - } - - /* restore the globals from the locals */ - gunzip_outbuf_count = w; /* restore global gunzip_window pointer */ - gunzip_bb = b_stored; /* restore global bit buffer */ - gunzip_bk = k_stored; - return 0; + inflate_stored(n, b_stored, k_stored, 1); // Setup inflate_stored + return -1; } - case 1: /* Inflate fixed + case 1: /* Inflate fixed * decompress an inflated type 1 (fixed Huffman codes) block. We should * either replace this with a custom decoder, or at least precompute the * Huffman tables. @@ -673,14 +610,11 @@ static int inflate_block(int *e) } /* decompress until an end-of-block code */ - if (inflate_codes(tl, td, bl, bd)) { - return 1; - } + inflate_codes(tl, td, bl, bd, 1); // Setup inflate_codes - /* free the decoding tables, return */ - huft_free(tl); - huft_free(td); - return 0; + /* huft_free code moved into inflate_codes */ + + return -2; } case 2: /* Inflate dynamic */ { @@ -811,7 +745,7 @@ static int inflate_block(int *e) if ((i = huft_build(ll, nl, 257, cplens, cplext, &tl, &bl)) != 0) { if (i == 1) { - error_msg_and_die("Incomplete literal tree"); + bb_error_msg_and_die("incomplete literal tree"); huft_free(tl); } return i; /* incomplete code set */ @@ -820,7 +754,7 @@ static int inflate_block(int *e) bd = dbits; if ((i = huft_build(ll + nl, nd, 0, cpdist, cpdext, &td, &bd)) != 0) { if (i == 1) { - error_msg_and_die("incomplete distance tree"); + bb_error_msg_and_die("incomplete distance tree"); huft_free(td); } huft_free(tl); @@ -828,130 +762,163 @@ static int inflate_block(int *e) } /* decompress until an end-of-block code */ - if (inflate_codes(tl, td, bl, bd)) { - return 1; - } + inflate_codes(tl, td, bl, bd, 1); // Setup inflate_codes - /* free the decoding tables, return */ - huft_free(tl); - huft_free(td); - return 0; + /* huft_free code moved into inflate_codes */ + + return -2; } default: /* bad block type */ - error_msg("bad block type %d\n", t); - return 2; + bb_error_msg_and_die("bad block type %d", t); } } -/* - * decompress an inflated entry - * - * GLOBAL VARIABLES: gunzip_outbuf_count, bk, gunzip_bb, hufts, inptr - */ +static void calculate_gunzip_crc(void) +{ + int n; + for (n = 0; n < gunzip_outbuf_count; n++) { + gunzip_crc = gunzip_crc_table[((int) gunzip_crc ^ (gunzip_window[n])) & 0xff] ^ (gunzip_crc >> 8); + } + gunzip_bytes_out += gunzip_outbuf_count; +} -extern ssize_t read_gz(int fd, void *buf, size_t count) +static int inflate_get_next_window(void) { - static int e = 0; /* last block flag */ - int r; /* result code */ - unsigned h = 0; /* maximum struct huft's malloc'ed */ - ssize_t written = count; - static char *output_buffer_ptr = 0; - - while (output_buffer_len == 0) { // We need more data - if (e) return 0; // No more data here! - gunzip_hufts = 0; - r = inflate_block(&e); - if (r != 0) { - error_msg_and_die("inflate error %d", r); - return -1; - } - if (gunzip_hufts > h) { - h = gunzip_hufts; + static int method = -1; // Method == -1 for stored, -2 for codes + static int e = 0; + static int needAnotherBlock = 1; + + gunzip_outbuf_count = 0; + + while(1) { + int ret; + + if (needAnotherBlock) { + if(e) { + calculate_gunzip_crc(); + e = 0; + needAnotherBlock = 1; + return 0; + } // Last block + method = inflate_block(&e); + needAnotherBlock = 0; } - if (e) { // Ok finished uncompressing, get any buffered uncompressed data - flush_gunzip_window(); + + switch (method) { + case -1: ret = inflate_stored(0,0,0,0); + break; + case -2: ret = inflate_codes(0,0,0,0,0); + break; + default: bb_error_msg_and_die("inflate error %d", method); } - output_buffer_ptr = output_buffer; + + if (ret == 1) { + calculate_gunzip_crc(); + return 1; // More data left + } else needAnotherBlock = 1; // End of that block } - if (count > output_buffer_len) written = output_buffer_len; // We're only giving them as much as we have! - memcpy(buf, output_buffer_ptr, written); - output_buffer_ptr += written; - output_buffer_len -= written; + /* Doesnt get here */ +} + +/* Initialise bytebuffer, be careful not to overfill the buffer */ +void inflate_init(unsigned int bufsize) +{ + /* Set the bytebuffer size, default is same as gunzip_wsize */ + bytebuffer_max = bufsize + 8; + bytebuffer_offset = 4; + bytebuffer_size = 0; +} - return written; +void inflate_cleanup(void) +{ + free(bytebuffer); } -extern void GZ_gzReadOpen(int fd, void *unused, int nUnused) +USE_DESKTOP(long long) int +inflate_unzip(int in, int out) { + USE_DESKTOP(long long total = 0;) + ssize_t nwrote; typedef void (*sig_type) (int); /* Allocate all global buffers (for DYN_ALLOC option) */ gunzip_window = xmalloc(gunzip_wsize); - output_buffer = xmalloc(gunzip_wsize); gunzip_outbuf_count = 0; gunzip_bytes_out = 0; - gunzip_src_fd = fd; - - gunzip_in_buffer = malloc(8); - - if (signal(SIGINT, SIG_IGN) != SIG_IGN) { - (void) signal(SIGINT, (sig_type) abort_gzip); - } -#ifdef SIGHUP - if (signal(SIGHUP, SIG_IGN) != SIG_IGN) { - (void) signal(SIGHUP, (sig_type) abort_gzip); - } -#endif + gunzip_src_fd = in; /* initialize gunzip_window, bit buffer */ gunzip_bk = 0; gunzip_bb = 0; /* Create the crc table */ - make_gunzip_crc_table(); -} + gunzip_crc_table = crc32_filltable(0); + gunzip_crc = ~0; + + /* Allocate space for buffer */ + bytebuffer = xmalloc(bytebuffer_max); + + while(1) { + int ret = inflate_get_next_window(); + nwrote = full_write(out, gunzip_window, gunzip_outbuf_count); + if (nwrote == -1) { + bb_perror_msg("write"); + return -1; + } + USE_DESKTOP(total += nwrote;) + if (ret == 0) break; + } -extern void GZ_gzReadClose(void) -{ /* Cleanup */ free(gunzip_window); - free(output_buffer); free(gunzip_crc_table); /* Store unused bytes in a global buffer so calling applets can access it */ - gunzip_in_buffer_count = 0; if (gunzip_bk >= 8) { /* Undo too much lookahead. The next read will be byte aligned * so we can discard unused bits in the last meaningful byte. */ - gunzip_in_buffer[gunzip_in_buffer_count] = gunzip_bb & 0xff; - gunzip_in_buffer_count++; + bytebuffer_offset--; + bytebuffer[bytebuffer_offset] = gunzip_bb & 0xff; gunzip_bb >>= 8; gunzip_bk -= 8; } + return USE_DESKTOP(total) + 0; } -extern int inflate(int in, int out) +USE_DESKTOP(long long) int +inflate_gunzip(int in, int out) { - char buf[8192]; - ssize_t nread, nwrote; - ssize_t total = 0; - - GZ_gzReadOpen(in, 0, 0); - while(1) { // Robbed from copyfd.c - nread = read_gz(in, buf, sizeof(buf)); - if (nread == 0) break; // no data to write - else if (nread == -1) { - perror_msg("read"); - return -1; - } - nwrote = full_write(out, buf, nread); - if (nwrote == -1) { - perror_msg("write"); - return -1; - } - total += nwrote; + uint32_t stored_crc = 0; + unsigned int count; + USE_DESKTOP(long long total = )inflate_unzip(in, out); + + USE_DESKTOP(if (total < 0) return total;) + + /* top up the input buffer with the rest of the trailer */ + count = bytebuffer_size - bytebuffer_offset; + if (count < 8) { + xread(in, &bytebuffer[bytebuffer_size], 8 - count); + bytebuffer_size += 8 - count; } - GZ_gzReadClose(); - return 0; + for (count = 0; count != 4; count++) { + stored_crc |= (bytebuffer[bytebuffer_offset] << (count * 8)); + bytebuffer_offset++; + } + + /* Validate decompression - crc */ + if (stored_crc != (~gunzip_crc)) { + bb_error_msg("crc error"); + return -1; + } + + /* Validate decompression - size */ + if (gunzip_bytes_out != + (bytebuffer[bytebuffer_offset] | (bytebuffer[bytebuffer_offset+1] << 8) | + (bytebuffer[bytebuffer_offset+2] << 16) | (bytebuffer[bytebuffer_offset+3] << 24))) { + bb_error_msg("incorrect length"); + return -1; + } + + return USE_DESKTOP(total) + 0; }