Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 1 | /* vi: set sw=4 ts=4: */ |
Rob Landley | e66c7ef | 2006-04-14 19:25:01 +0000 | [diff] [blame] | 2 | /* Small bzip2 deflate implementation, by Rob Landley (rob@landley.net). |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 3 | |
Rob Landley | e66c7ef | 2006-04-14 19:25:01 +0000 | [diff] [blame] | 4 | Based on bzip2 decompression code by Julian R Seward (jseward@acm.org), |
| 5 | which also acknowledges contributions by Mike Burrows, David Wheeler, |
| 6 | Peter Fenwick, Alistair Moffat, Radford Neal, Ian H. Witten, |
| 7 | Robert Sedgewick, and Jon L. Bentley. |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 8 | |
Rob Landley | e66c7ef | 2006-04-14 19:25:01 +0000 | [diff] [blame] | 9 | Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 10 | */ |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 11 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 12 | /* |
| 13 | Size and speed optimizations by Manuel Novoa III (mjn3@codepoet.org). |
| 14 | |
Eric Andersen | aff114c | 2004-04-14 17:51:38 +0000 | [diff] [blame] | 15 | More efficient reading of Huffman codes, a streamlined read_bunzip() |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 16 | function, and various other tweaks. In (limited) tests, approximately |
| 17 | 20% faster than bzcat on x86 and about 10% faster on arm. |
| 18 | |
| 19 | Note that about 2/3 of the time is spent in read_unzip() reversing |
| 20 | the Burrows-Wheeler transformation. Much of that time is delay |
| 21 | resulting from cache misses. |
| 22 | |
| 23 | I would ask that anyone benefiting from this work, especially those |
| 24 | using it in commercial products, consider making a donation to my local |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 25 | non-profit hospice organization (www.hospiceacadiana.com) in the name of |
Bernhard Reutner-Fischer | cfb53df | 2006-04-02 21:50:01 +0000 | [diff] [blame] | 26 | the woman I loved, Toni W. Hagan, who passed away Feb. 12, 2003. |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 27 | |
| 28 | Manuel |
| 29 | */ |
| 30 | |
Glenn L McGrath | 1c83440 | 2003-10-28 23:32:12 +0000 | [diff] [blame] | 31 | #include "libbb.h" |
Bernhard Reutner-Fischer | cfb53df | 2006-04-02 21:50:01 +0000 | [diff] [blame] | 32 | #include "unarchive.h" |
| 33 | |
Eric Andersen | aff114c | 2004-04-14 17:51:38 +0000 | [diff] [blame] | 34 | /* Constants for Huffman coding */ |
Denis Vlasenko | bf0a201 | 2006-12-26 10:42:51 +0000 | [diff] [blame] | 35 | #define MAX_GROUPS 6 |
| 36 | #define GROUP_SIZE 50 /* 64 would have been more efficient */ |
| 37 | #define MAX_HUFCODE_BITS 20 /* Longest Huffman code allowed */ |
| 38 | #define MAX_SYMBOLS 258 /* 256 literals + RUNA + RUNB */ |
| 39 | #define SYMBOL_RUNA 0 |
| 40 | #define SYMBOL_RUNB 1 |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 41 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 42 | /* Status return values */ |
Denis Vlasenko | bf0a201 | 2006-12-26 10:42:51 +0000 | [diff] [blame] | 43 | #define RETVAL_OK 0 |
| 44 | #define RETVAL_LAST_BLOCK (-1) |
| 45 | #define RETVAL_NOT_BZIP_DATA (-2) |
| 46 | #define RETVAL_UNEXPECTED_INPUT_EOF (-3) |
Denis Vlasenko | 52a4388 | 2007-10-10 20:53:41 +0000 | [diff] [blame] | 47 | #define RETVAL_SHORT_WRITE (-4) |
Denis Vlasenko | bf0a201 | 2006-12-26 10:42:51 +0000 | [diff] [blame] | 48 | #define RETVAL_DATA_ERROR (-5) |
| 49 | #define RETVAL_OUT_OF_MEMORY (-6) |
| 50 | #define RETVAL_OBSOLETE_INPUT (-7) |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 51 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 52 | /* Other housekeeping constants */ |
Denis Vlasenko | bf0a201 | 2006-12-26 10:42:51 +0000 | [diff] [blame] | 53 | #define IOBUF_SIZE 4096 |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 54 | |
Eric Andersen | aff114c | 2004-04-14 17:51:38 +0000 | [diff] [blame] | 55 | /* This is what we know about each Huffman coding group */ |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 56 | struct group_data { |
Denis Vlasenko | 52a4388 | 2007-10-10 20:53:41 +0000 | [diff] [blame] | 57 | /* We have an extra slot at the end of limit[] for a sentinel value. */ |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 58 | int limit[MAX_HUFCODE_BITS+1], base[MAX_HUFCODE_BITS], permute[MAX_SYMBOLS]; |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 59 | int minLen, maxLen; |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 60 | }; |
| 61 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 62 | /* Structure holding all the housekeeping data, including IO buffers and |
Denis Vlasenko | 52a4388 | 2007-10-10 20:53:41 +0000 | [diff] [blame] | 63 | * memory that persists between calls to bunzip |
| 64 | * Found the most used member: |
| 65 | * cat this_file.c | sed -e 's/"/ /g' -e "s/'/ /g" | xargs -n1 \ |
| 66 | * | grep 'bd->' | sed 's/^.*bd->/bd->/' | sort | $PAGER |
| 67 | * and moved it (inbufBitCount) to offset 0. |
| 68 | */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 69 | |
Denis Vlasenko | c6758a0 | 2007-04-10 21:40:19 +0000 | [diff] [blame] | 70 | struct bunzip_data { |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 71 | /* I/O tracking data (file handles, buffers, positions, etc.) */ |
Denis Vlasenko | 52a4388 | 2007-10-10 20:53:41 +0000 | [diff] [blame] | 72 | unsigned inbufBitCount, inbufBits; |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 73 | int in_fd, out_fd, inbufCount, inbufPos /*, outbufPos*/; |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 74 | unsigned char *inbuf /*,*outbuf*/; |
Denis Vlasenko | 52a4388 | 2007-10-10 20:53:41 +0000 | [diff] [blame] | 75 | |
| 76 | /* State for interrupting output loop */ |
| 77 | int writeCopies, writePos, writeRunCountdown, writeCount, writeCurrent; |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 78 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 79 | /* The CRC values stored in the block header and calculated from the data */ |
Rob Landley | c57ec37 | 2006-04-10 17:07:15 +0000 | [diff] [blame] | 80 | uint32_t headerCRC, totalCRC, writeCRC; |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 81 | |
Denis Vlasenko | c6758a0 | 2007-04-10 21:40:19 +0000 | [diff] [blame] | 82 | /* Intermediate buffer and its size (in bytes) */ |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 83 | unsigned *dbuf, dbufSize; |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 84 | |
Denis Vlasenko | c6758a0 | 2007-04-10 21:40:19 +0000 | [diff] [blame] | 85 | /* For I/O error handling */ |
| 86 | jmp_buf jmpbuf; |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 87 | |
Denis Vlasenko | 52a4388 | 2007-10-10 20:53:41 +0000 | [diff] [blame] | 88 | /* Big things go last (register-relative addressing can be larger for big offsets) */ |
Denis Vlasenko | c6758a0 | 2007-04-10 21:40:19 +0000 | [diff] [blame] | 89 | uint32_t crc32Table[256]; |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 90 | unsigned char selectors[32768]; /* nSelectors=15 bits */ |
Eric Andersen | aff114c | 2004-04-14 17:51:38 +0000 | [diff] [blame] | 91 | struct group_data groups[MAX_GROUPS]; /* Huffman coding tables */ |
Denis Vlasenko | c6758a0 | 2007-04-10 21:40:19 +0000 | [diff] [blame] | 92 | }; |
| 93 | /* typedef struct bunzip_data bunzip_data; -- done in .h file */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 94 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 95 | |
| 96 | /* Return the next nnn bits of input. All reads from the compressed input |
| 97 | are done through this function. All reads are big endian */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 98 | |
Denis Vlasenko | 52a4388 | 2007-10-10 20:53:41 +0000 | [diff] [blame] | 99 | static unsigned get_bits(bunzip_data *bd, int bits_wanted) |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 100 | { |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 101 | unsigned bits = 0; |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 102 | |
| 103 | /* If we need to get more data from the byte buffer, do so. (Loop getting |
| 104 | one byte at a time to enforce endianness and avoid unaligned access.) */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 105 | |
Denis Vlasenko | 6b06cb8 | 2008-05-15 21:30:45 +0000 | [diff] [blame] | 106 | while ((int)(bd->inbufBitCount) < bits_wanted) { |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 107 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 108 | /* If we need to read more data from file into byte buffer, do so */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 109 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 110 | if (bd->inbufPos == bd->inbufCount) { |
Denis Vlasenko | c6758a0 | 2007-04-10 21:40:19 +0000 | [diff] [blame] | 111 | /* if "no input fd" case: in_fd == -1, read fails, we jump */ |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 112 | bd->inbufCount = read(bd->in_fd, bd->inbuf, IOBUF_SIZE); |
| 113 | if (bd->inbufCount <= 0) |
| 114 | longjmp(bd->jmpbuf, RETVAL_UNEXPECTED_INPUT_EOF); |
| 115 | bd->inbufPos = 0; |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 116 | } |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 117 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 118 | /* Avoid 32-bit overflow (dump bit buffer to top of output) */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 119 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 120 | if (bd->inbufBitCount >= 24) { |
| 121 | bits = bd->inbufBits & ((1 << bd->inbufBitCount) - 1); |
| 122 | bits_wanted -= bd->inbufBitCount; |
| 123 | bits <<= bits_wanted; |
| 124 | bd->inbufBitCount = 0; |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 125 | } |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 126 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 127 | /* Grab next 8 bits of input from buffer. */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 128 | |
Denis Vlasenko | 52a4388 | 2007-10-10 20:53:41 +0000 | [diff] [blame] | 129 | bd->inbufBits = (bd->inbufBits << 8) | bd->inbuf[bd->inbufPos++]; |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 130 | bd->inbufBitCount += 8; |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 131 | } |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 132 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 133 | /* Calculate result */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 134 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 135 | bd->inbufBitCount -= bits_wanted; |
| 136 | bits |= (bd->inbufBits >> bd->inbufBitCount) & ((1 << bits_wanted) - 1); |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 137 | |
| 138 | return bits; |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 139 | } |
| 140 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 141 | /* Unpacks the next block and sets up for the inverse burrows-wheeler step. */ |
Eric Andersen | 1acfb72 | 2003-10-18 01:59:46 +0000 | [diff] [blame] | 142 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 143 | static int get_next_block(bunzip_data *bd) |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 144 | { |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 145 | struct group_data *hufGroup; |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 146 | int dbufCount, nextSym, dbufSize, groupCount, *base, *limit, selector, |
| 147 | i, j, k, t, runPos, symCount, symTotal, nSelectors, byteCount[256]; |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 148 | unsigned char uc, symToByte[256], mtfSymbol[256], *selectors; |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 149 | unsigned *dbuf, origPtr; |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 150 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 151 | dbuf = bd->dbuf; |
| 152 | dbufSize = bd->dbufSize; |
| 153 | selectors = bd->selectors; |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 154 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 155 | /* Reset longjmp I/O error handling */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 156 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 157 | i = setjmp(bd->jmpbuf); |
Denis Vlasenko | bf0a201 | 2006-12-26 10:42:51 +0000 | [diff] [blame] | 158 | if (i) return i; |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 159 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 160 | /* Read in header signature and CRC, then validate signature. |
| 161 | (last block signature means CRC is for whole file, return now) */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 162 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 163 | i = get_bits(bd, 24); |
| 164 | j = get_bits(bd, 24); |
| 165 | bd->headerCRC = get_bits(bd, 32); |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 166 | if ((i == 0x177245) && (j == 0x385090)) return RETVAL_LAST_BLOCK; |
| 167 | if ((i != 0x314159) || (j != 0x265359)) return RETVAL_NOT_BZIP_DATA; |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 168 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 169 | /* We can add support for blockRandomised if anybody complains. There was |
| 170 | some code for this in busybox 1.0.0-pre3, but nobody ever noticed that |
| 171 | it didn't actually work. */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 172 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 173 | if (get_bits(bd, 1)) return RETVAL_OBSOLETE_INPUT; |
| 174 | origPtr = get_bits(bd, 24); |
Denis Vlasenko | 6b06cb8 | 2008-05-15 21:30:45 +0000 | [diff] [blame] | 175 | if ((int)origPtr > dbufSize) return RETVAL_DATA_ERROR; |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 176 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 177 | /* mapping table: if some byte values are never used (encoding things |
| 178 | like ascii text), the compression code removes the gaps to have fewer |
| 179 | symbols to deal with, and writes a sparse bitfield indicating which |
| 180 | values were present. We make a translation table to convert the symbols |
| 181 | back to the corresponding bytes. */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 182 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 183 | t = get_bits(bd, 16); |
| 184 | symTotal = 0; |
| 185 | for (i = 0; i < 16; i++) { |
| 186 | if (t & (1 << (15-i))) { |
| 187 | k = get_bits(bd, 16); |
| 188 | for (j = 0; j < 16; j++) |
| 189 | if (k & (1 << (15-j))) |
| 190 | symToByte[symTotal++] = (16*i) + j; |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 191 | } |
| 192 | } |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 193 | |
Eric Andersen | aff114c | 2004-04-14 17:51:38 +0000 | [diff] [blame] | 194 | /* How many different Huffman coding groups does this block use? */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 195 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 196 | groupCount = get_bits(bd, 3); |
| 197 | if (groupCount < 2 || groupCount > MAX_GROUPS) |
| 198 | return RETVAL_DATA_ERROR; |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 199 | |
Eric Andersen | aff114c | 2004-04-14 17:51:38 +0000 | [diff] [blame] | 200 | /* nSelectors: Every GROUP_SIZE many symbols we select a new Huffman coding |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 201 | group. Read in the group selector list, which is stored as MTF encoded |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 202 | bit runs. (MTF=Move To Front, as each value is used it's moved to the |
| 203 | start of the list.) */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 204 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 205 | nSelectors = get_bits(bd, 15); |
| 206 | if (!nSelectors) return RETVAL_DATA_ERROR; |
| 207 | for (i = 0; i < groupCount; i++) mtfSymbol[i] = i; |
| 208 | for (i = 0; i < nSelectors; i++) { |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 209 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 210 | /* Get next value */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 211 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 212 | for (j = 0; get_bits(bd, 1); j++) |
Denis Vlasenko | 52a4388 | 2007-10-10 20:53:41 +0000 | [diff] [blame] | 213 | if (j >= groupCount) return RETVAL_DATA_ERROR; |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 214 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 215 | /* Decode MTF to get the next selector */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 216 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 217 | uc = mtfSymbol[j]; |
Denis Vlasenko | bf0a201 | 2006-12-26 10:42:51 +0000 | [diff] [blame] | 218 | for (;j;j--) mtfSymbol[j] = mtfSymbol[j-1]; |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 219 | mtfSymbol[0] = selectors[i] = uc; |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 220 | } |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 221 | |
Eric Andersen | aff114c | 2004-04-14 17:51:38 +0000 | [diff] [blame] | 222 | /* Read the Huffman coding tables for each group, which code for symTotal |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 223 | literal symbols, plus two run symbols (RUNA, RUNB) */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 224 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 225 | symCount = symTotal + 2; |
| 226 | for (j = 0; j < groupCount; j++) { |
| 227 | unsigned char length[MAX_SYMBOLS], temp[MAX_HUFCODE_BITS+1]; |
| 228 | int minLen, maxLen, pp; |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 229 | |
Eric Andersen | aff114c | 2004-04-14 17:51:38 +0000 | [diff] [blame] | 230 | /* Read Huffman code lengths for each symbol. They're stored in |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 231 | a way similar to mtf; record a starting value for the first symbol, |
| 232 | and an offset from the previous value for everys symbol after that. |
| 233 | (Subtracting 1 before the loop and then adding it back at the end is |
| 234 | an optimization that makes the test inside the loop simpler: symbol |
| 235 | length 0 becomes negative, so an unsigned inequality catches it.) */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 236 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 237 | t = get_bits(bd, 5) - 1; |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 238 | for (i = 0; i < symCount; i++) { |
Denis Vlasenko | bf0a201 | 2006-12-26 10:42:51 +0000 | [diff] [blame] | 239 | for (;;) { |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 240 | if ((unsigned)t > (MAX_HUFCODE_BITS-1)) |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 241 | return RETVAL_DATA_ERROR; |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 242 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 243 | /* If first bit is 0, stop. Else second bit indicates whether |
| 244 | to increment or decrement the value. Optimization: grab 2 |
| 245 | bits and unget the second if the first was 0. */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 246 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 247 | k = get_bits(bd, 2); |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 248 | if (k < 2) { |
| 249 | bd->inbufBitCount++; |
| 250 | break; |
| 251 | } |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 252 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 253 | /* Add one if second bit 1, else subtract 1. Avoids if/else */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 254 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 255 | t += (((k+1) & 2) - 1); |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 256 | } |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 257 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 258 | /* Correct for the initial -1, to get the final symbol length */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 259 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 260 | length[i] = t + 1; |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 261 | } |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 262 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 263 | /* Find largest and smallest lengths in this group */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 264 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 265 | minLen = maxLen = length[0]; |
Denis Vlasenko | bf0a201 | 2006-12-26 10:42:51 +0000 | [diff] [blame] | 266 | for (i = 1; i < symCount; i++) { |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 267 | if (length[i] > maxLen) maxLen = length[i]; |
| 268 | else if (length[i] < minLen) minLen = length[i]; |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 269 | } |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 270 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 271 | /* Calculate permute[], base[], and limit[] tables from length[]. |
| 272 | * |
Eric Andersen | aff114c | 2004-04-14 17:51:38 +0000 | [diff] [blame] | 273 | * permute[] is the lookup table for converting Huffman coded symbols |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 274 | * into decoded symbols. base[] is the amount to subtract from the |
Eric Andersen | aff114c | 2004-04-14 17:51:38 +0000 | [diff] [blame] | 275 | * value of a Huffman symbol of a given length when using permute[]. |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 276 | * |
| 277 | * limit[] indicates the largest numerical value a symbol with a given |
Eric Andersen | aff114c | 2004-04-14 17:51:38 +0000 | [diff] [blame] | 278 | * number of bits can have. This is how the Huffman codes can vary in |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 279 | * length: each code with a value>limit[length] needs another bit. |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 280 | */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 281 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 282 | hufGroup = bd->groups + j; |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 283 | hufGroup->minLen = minLen; |
| 284 | hufGroup->maxLen = maxLen; |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 285 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 286 | /* Note that minLen can't be smaller than 1, so we adjust the base |
| 287 | and limit array pointers so we're not always wasting the first |
| 288 | entry. We do this again when using them (during symbol decoding).*/ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 289 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 290 | base = hufGroup->base - 1; |
| 291 | limit = hufGroup->limit - 1; |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 292 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 293 | /* Calculate permute[]. Concurently, initialize temp[] and limit[]. */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 294 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 295 | pp = 0; |
| 296 | for (i = minLen; i <= maxLen; i++) { |
| 297 | temp[i] = limit[i] = 0; |
| 298 | for (t = 0; t < symCount; t++) |
| 299 | if (length[t] == i) |
| 300 | hufGroup->permute[pp++] = t; |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 301 | } |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 302 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 303 | /* Count symbols coded for at each bit length */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 304 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 305 | for (i = 0; i < symCount; i++) temp[length[i]]++; |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 306 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 307 | /* Calculate limit[] (the largest symbol-coding value at each bit |
| 308 | * length, which is (previous limit<<1)+symbols at this level), and |
| 309 | * base[] (number of symbols to ignore at each bit length, which is |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 310 | * limit minus the cumulative count of symbols coded for already). */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 311 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 312 | pp = t = 0; |
| 313 | for (i = minLen; i < maxLen; i++) { |
| 314 | pp += temp[i]; |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 315 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 316 | /* We read the largest possible symbol size and then unget bits |
| 317 | after determining how many we need, and those extra bits could |
| 318 | be set to anything. (They're noise from future symbols.) At |
| 319 | each level we're really only interested in the first few bits, |
| 320 | so here we set all the trailing to-be-ignored bits to 1 so they |
| 321 | don't affect the value>limit[length] comparison. */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 322 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 323 | limit[i] = (pp << (maxLen - i)) - 1; |
| 324 | pp <<= 1; |
| 325 | t += temp[i]; |
| 326 | base[i+1] = pp - t; |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 327 | } |
Denis Vlasenko | 52a4388 | 2007-10-10 20:53:41 +0000 | [diff] [blame] | 328 | limit[maxLen+1] = INT_MAX; /* Sentinel value for reading next sym. */ |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 329 | limit[maxLen] = pp + temp[maxLen] - 1; |
| 330 | base[minLen] = 0; |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 331 | } |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 332 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 333 | /* We've finished reading and digesting the block header. Now read this |
Eric Andersen | aff114c | 2004-04-14 17:51:38 +0000 | [diff] [blame] | 334 | block's Huffman coded symbols from the file and undo the Huffman coding |
Denis Vlasenko | 52a4388 | 2007-10-10 20:53:41 +0000 | [diff] [blame] | 335 | and run length encoding, saving the result into dbuf[dbufCount++] = uc */ |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 336 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 337 | /* Initialize symbol occurrence counters and symbol Move To Front table */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 338 | |
Denis Vlasenko | 52a4388 | 2007-10-10 20:53:41 +0000 | [diff] [blame] | 339 | memset(byteCount, 0, sizeof(byteCount)); /* smaller, maybe slower? */ |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 340 | for (i = 0; i < 256; i++) { |
Denis Vlasenko | 52a4388 | 2007-10-10 20:53:41 +0000 | [diff] [blame] | 341 | //byteCount[i] = 0; |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 342 | mtfSymbol[i] = (unsigned char)i; |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 343 | } |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 344 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 345 | /* Loop through compressed symbols. */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 346 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 347 | runPos = dbufCount = selector = 0; |
Denis Vlasenko | bf0a201 | 2006-12-26 10:42:51 +0000 | [diff] [blame] | 348 | for (;;) { |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 349 | |
Rob Landley | a8b98d6 | 2004-11-16 12:07:04 +0000 | [diff] [blame] | 350 | /* fetch next Huffman coding group from list. */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 351 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 352 | symCount = GROUP_SIZE - 1; |
| 353 | if (selector >= nSelectors) return RETVAL_DATA_ERROR; |
| 354 | hufGroup = bd->groups + selectors[selector++]; |
| 355 | base = hufGroup->base - 1; |
| 356 | limit = hufGroup->limit - 1; |
| 357 | continue_this_group: |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 358 | |
Eric Andersen | aff114c | 2004-04-14 17:51:38 +0000 | [diff] [blame] | 359 | /* Read next Huffman-coded symbol. */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 360 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 361 | /* Note: It is far cheaper to read maxLen bits and back up than it is |
| 362 | to read minLen bits and then an additional bit at a time, testing |
| 363 | as we go. Because there is a trailing last block (with file CRC), |
| 364 | there is no danger of the overread causing an unexpected EOF for a |
| 365 | valid compressed file. As a further optimization, we do the read |
| 366 | inline (falling back to a call to get_bits if the buffer runs |
| 367 | dry). The following (up to got_huff_bits:) is equivalent to |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 368 | j = get_bits(bd, hufGroup->maxLen); |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 369 | */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 370 | |
Denis Vlasenko | 6b06cb8 | 2008-05-15 21:30:45 +0000 | [diff] [blame] | 371 | while ((int)(bd->inbufBitCount) < hufGroup->maxLen) { |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 372 | if (bd->inbufPos == bd->inbufCount) { |
| 373 | j = get_bits(bd, hufGroup->maxLen); |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 374 | goto got_huff_bits; |
| 375 | } |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 376 | bd->inbufBits = (bd->inbufBits << 8) | bd->inbuf[bd->inbufPos++]; |
| 377 | bd->inbufBitCount += 8; |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 378 | }; |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 379 | bd->inbufBitCount -= hufGroup->maxLen; |
| 380 | j = (bd->inbufBits >> bd->inbufBitCount) & ((1 << hufGroup->maxLen) - 1); |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 381 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 382 | got_huff_bits: |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 383 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 384 | /* Figure how how many bits are in next symbol and unget extras */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 385 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 386 | i = hufGroup->minLen; |
| 387 | while (j > limit[i]) ++i; |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 388 | bd->inbufBitCount += (hufGroup->maxLen - i); |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 389 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 390 | /* Huffman decode value to get nextSym (with bounds checking) */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 391 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 392 | if (i > hufGroup->maxLen) |
| 393 | return RETVAL_DATA_ERROR; |
| 394 | j = (j >> (hufGroup->maxLen - i)) - base[i]; |
| 395 | if ((unsigned)j >= MAX_SYMBOLS) |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 396 | return RETVAL_DATA_ERROR; |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 397 | nextSym = hufGroup->permute[j]; |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 398 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 399 | /* We have now decoded the symbol, which indicates either a new literal |
| 400 | byte, or a repeated run of the most recent literal byte. First, |
| 401 | check if nextSym indicates a repeated run, and if so loop collecting |
| 402 | how many times to repeat the last literal. */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 403 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 404 | if ((unsigned)nextSym <= SYMBOL_RUNB) { /* RUNA or RUNB */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 405 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 406 | /* If this is the start of a new run, zero out counter */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 407 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 408 | if (!runPos) { |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 409 | runPos = 1; |
| 410 | t = 0; |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 411 | } |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 412 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 413 | /* Neat trick that saves 1 symbol: instead of or-ing 0 or 1 at |
| 414 | each bit position, add 1 or 2 instead. For example, |
| 415 | 1011 is 1<<0 + 1<<1 + 2<<2. 1010 is 2<<0 + 2<<1 + 1<<2. |
| 416 | You can make any bit pattern that way using 1 less symbol than |
| 417 | the basic or 0/1 method (except all bits 0, which would use no |
| 418 | symbols, but a run of length 0 doesn't mean anything in this |
| 419 | context). Thus space is saved. */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 420 | |
Eric Andersen | 1acfb72 | 2003-10-18 01:59:46 +0000 | [diff] [blame] | 421 | t += (runPos << nextSym); /* +runPos if RUNA; +2*runPos if RUNB */ |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 422 | if (runPos < dbufSize) runPos <<= 1; |
Rob Landley | a8b98d6 | 2004-11-16 12:07:04 +0000 | [diff] [blame] | 423 | goto end_of_huffman_loop; |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 424 | } |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 425 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 426 | /* When we hit the first non-run symbol after a run, we now know |
| 427 | how many times to repeat the last literal, so append that many |
| 428 | copies to our buffer of decoded symbols (dbuf) now. (The last |
| 429 | literal used is the one at the head of the mtfSymbol array.) */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 430 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 431 | if (runPos) { |
| 432 | runPos = 0; |
| 433 | if (dbufCount + t >= dbufSize) return RETVAL_DATA_ERROR; |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 434 | |
| 435 | uc = symToByte[mtfSymbol[0]]; |
| 436 | byteCount[uc] += t; |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 437 | while (t--) dbuf[dbufCount++] = uc; |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 438 | } |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 439 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 440 | /* Is this the terminating symbol? */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 441 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 442 | if (nextSym > symTotal) break; |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 443 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 444 | /* At this point, nextSym indicates a new literal character. Subtract |
| 445 | one to get the position in the MTF array at which this literal is |
| 446 | currently to be found. (Note that the result can't be -1 or 0, |
| 447 | because 0 and 1 are RUNA and RUNB. But another instance of the |
| 448 | first symbol in the mtf array, position 0, would have been handled |
| 449 | as part of a run above. Therefore 1 unused mtf position minus |
| 450 | 2 non-literal nextSym values equals -1.) */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 451 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 452 | if (dbufCount >= dbufSize) return RETVAL_DATA_ERROR; |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 453 | i = nextSym - 1; |
| 454 | uc = mtfSymbol[i]; |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 455 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 456 | /* Adjust the MTF array. Since we typically expect to move only a |
| 457 | * small number of symbols, and are bound by 256 in any case, using |
| 458 | * memmove here would typically be bigger and slower due to function |
| 459 | * call overhead and other assorted setup costs. */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 460 | |
Eric Andersen | 1acfb72 | 2003-10-18 01:59:46 +0000 | [diff] [blame] | 461 | do { |
| 462 | mtfSymbol[i] = mtfSymbol[i-1]; |
| 463 | } while (--i); |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 464 | mtfSymbol[0] = uc; |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 465 | uc = symToByte[uc]; |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 466 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 467 | /* We have our literal byte. Save it into dbuf. */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 468 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 469 | byteCount[uc]++; |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 470 | dbuf[dbufCount++] = (unsigned)uc; |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 471 | |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 472 | /* Skip group initialization if we're not done with this group. Done |
| 473 | * this way to avoid compiler warning. */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 474 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 475 | end_of_huffman_loop: |
| 476 | if (symCount--) goto continue_this_group; |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 477 | } |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 478 | |
Eric Andersen | aff114c | 2004-04-14 17:51:38 +0000 | [diff] [blame] | 479 | /* At this point, we've read all the Huffman-coded symbols (and repeated |
Denis Vlasenko | 246b5c3 | 2007-04-10 17:18:12 +0000 | [diff] [blame] | 480 | runs) for this block from the input stream, and decoded them into the |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 481 | intermediate buffer. There are dbufCount many decoded bytes in dbuf[]. |
| 482 | Now undo the Burrows-Wheeler transform on dbuf. |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 483 | See http://dogma.net/markn/articles/bwt/bwt.htm |
| 484 | */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 485 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 486 | /* Turn byteCount into cumulative occurrence counts of 0 to n-1. */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 487 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 488 | j = 0; |
| 489 | for (i = 0; i < 256; i++) { |
| 490 | k = j + byteCount[i]; |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 491 | byteCount[i] = j; |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 492 | j = k; |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 493 | } |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 494 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 495 | /* Figure out what order dbuf would be in if we sorted it. */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 496 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 497 | for (i = 0; i < dbufCount; i++) { |
| 498 | uc = (unsigned char)(dbuf[i] & 0xff); |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 499 | dbuf[byteCount[uc]] |= (i << 8); |
| 500 | byteCount[uc]++; |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 501 | } |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 502 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 503 | /* Decode first byte by hand to initialize "previous" byte. Note that it |
| 504 | doesn't get output, and if the first three characters are identical |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 505 | it doesn't qualify as a run (hence writeRunCountdown=5). */ |
Rob Landley | 2c98c40 | 2006-02-17 05:12:03 +0000 | [diff] [blame] | 506 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 507 | if (dbufCount) { |
Denis Vlasenko | 6b06cb8 | 2008-05-15 21:30:45 +0000 | [diff] [blame] | 508 | if ((int)origPtr >= dbufCount) return RETVAL_DATA_ERROR; |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 509 | bd->writePos = dbuf[origPtr]; |
| 510 | bd->writeCurrent = (unsigned char)(bd->writePos & 0xff); |
| 511 | bd->writePos >>= 8; |
| 512 | bd->writeRunCountdown = 5; |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 513 | } |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 514 | bd->writeCount = dbufCount; |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 515 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 516 | return RETVAL_OK; |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 517 | } |
| 518 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 519 | /* Undo burrows-wheeler transform on intermediate buffer to produce output. |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 520 | If start_bunzip was initialized with out_fd=-1, then up to len bytes of |
| 521 | data are written to outbuf. Return value is number of bytes written or |
| 522 | error (all errors are negative numbers). If out_fd!=-1, outbuf and len |
| 523 | are ignored, data is written to out_fd and return is RETVAL_OK or error. |
| 524 | */ |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 525 | |
Denis Vlasenko | c6758a0 | 2007-04-10 21:40:19 +0000 | [diff] [blame] | 526 | int read_bunzip(bunzip_data *bd, char *outbuf, int len) |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 527 | { |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 528 | const unsigned *dbuf; |
| 529 | int pos, current, previous, gotcount; |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 530 | |
| 531 | /* If last read was short due to end of file, return last block now */ |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 532 | if (bd->writeCount < 0) return bd->writeCount; |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 533 | |
| 534 | gotcount = 0; |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 535 | dbuf = bd->dbuf; |
| 536 | pos = bd->writePos; |
| 537 | current = bd->writeCurrent; |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 538 | |
| 539 | /* We will always have pending decoded data to write into the output |
| 540 | buffer unless this is the very first call (in which case we haven't |
Eric Andersen | aff114c | 2004-04-14 17:51:38 +0000 | [diff] [blame] | 541 | Huffman-decoded a block into the intermediate buffer yet). */ |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 542 | |
| 543 | if (bd->writeCopies) { |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 544 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 545 | /* Inside the loop, writeCopies means extra copies (beyond 1) */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 546 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 547 | --bd->writeCopies; |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 548 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 549 | /* Loop outputting bytes */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 550 | |
Denis Vlasenko | bf0a201 | 2006-12-26 10:42:51 +0000 | [diff] [blame] | 551 | for (;;) { |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 552 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 553 | /* If the output buffer is full, snapshot state and return */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 554 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 555 | if (gotcount >= len) { |
Denis Vlasenko | 52a4388 | 2007-10-10 20:53:41 +0000 | [diff] [blame] | 556 | bd->writePos = pos; |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 557 | bd->writeCurrent = current; |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 558 | bd->writeCopies++; |
| 559 | return len; |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 560 | } |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 561 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 562 | /* Write next byte into output buffer, updating CRC */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 563 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 564 | outbuf[gotcount++] = current; |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 565 | bd->writeCRC = (bd->writeCRC << 8) |
| 566 | ^ bd->crc32Table[(bd->writeCRC >> 24) ^ current]; |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 567 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 568 | /* Loop now if we're outputting multiple copies of this byte */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 569 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 570 | if (bd->writeCopies) { |
| 571 | --bd->writeCopies; |
| 572 | continue; |
| 573 | } |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 574 | decode_next_byte: |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 575 | if (!bd->writeCount--) break; |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 576 | /* Follow sequence vector to undo Burrows-Wheeler transform */ |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 577 | previous = current; |
| 578 | pos = dbuf[pos]; |
| 579 | current = pos & 0xff; |
| 580 | pos >>= 8; |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 581 | |
Denis Vlasenko | 52a4388 | 2007-10-10 20:53:41 +0000 | [diff] [blame] | 582 | /* After 3 consecutive copies of the same byte, the 4th |
| 583 | * is a repeat count. We count down from 4 instead |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 584 | * of counting up because testing for non-zero is faster */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 585 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 586 | if (--bd->writeRunCountdown) { |
| 587 | if (current != previous) |
| 588 | bd->writeRunCountdown = 4; |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 589 | } else { |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 590 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 591 | /* We have a repeated run, this byte indicates the count */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 592 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 593 | bd->writeCopies = current; |
| 594 | current = previous; |
| 595 | bd->writeRunCountdown = 5; |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 596 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 597 | /* Sometimes there are just 3 bytes (run length 0) */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 598 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 599 | if (!bd->writeCopies) goto decode_next_byte; |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 600 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 601 | /* Subtract the 1 copy we'd output anyway to get extras */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 602 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 603 | --bd->writeCopies; |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 604 | } |
| 605 | } |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 606 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 607 | /* Decompression of this block completed successfully */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 608 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 609 | bd->writeCRC = ~bd->writeCRC; |
| 610 | bd->totalCRC = ((bd->totalCRC << 1) | (bd->totalCRC >> 31)) ^ bd->writeCRC; |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 611 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 612 | /* If this block had a CRC error, force file level CRC error. */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 613 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 614 | if (bd->writeCRC != bd->headerCRC) { |
Denis Vlasenko | 52a4388 | 2007-10-10 20:53:41 +0000 | [diff] [blame] | 615 | bd->totalCRC = bd->headerCRC + 1; |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 616 | return RETVAL_LAST_BLOCK; |
| 617 | } |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 618 | } |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 619 | |
Eric Andersen | aff114c | 2004-04-14 17:51:38 +0000 | [diff] [blame] | 620 | /* Refill the intermediate buffer by Huffman-decoding next block of input */ |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 621 | /* (previous is just a convenient unused temp variable here) */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 622 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 623 | previous = get_next_block(bd); |
| 624 | if (previous) { |
| 625 | bd->writeCount = previous; |
| 626 | return (previous != RETVAL_LAST_BLOCK) ? previous : gotcount; |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 627 | } |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 628 | bd->writeCRC = ~0; |
| 629 | pos = bd->writePos; |
| 630 | current = bd->writeCurrent; |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 631 | goto decode_next_byte; |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 632 | } |
| 633 | |
Denis Vlasenko | c6758a0 | 2007-04-10 21:40:19 +0000 | [diff] [blame] | 634 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 635 | /* Allocate the structure, read file header. If in_fd==-1, inbuf must contain |
| 636 | a complete bunzip file (len bytes long). If in_fd!=-1, inbuf and len are |
| 637 | ignored, and data is read from file handle into temporary buffer. */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 638 | |
Denis Vlasenko | c6758a0 | 2007-04-10 21:40:19 +0000 | [diff] [blame] | 639 | /* Because bunzip2 is used for help text unpacking, and because bb_show_usage() |
| 640 | should work for NOFORK applets too, we must be extremely careful to not leak |
| 641 | any allocations! */ |
| 642 | |
| 643 | int start_bunzip(bunzip_data **bdp, int in_fd, const unsigned char *inbuf, |
Rob Landley | 1ff789c | 2005-09-25 03:12:26 +0000 | [diff] [blame] | 644 | int len) |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 645 | { |
| 646 | bunzip_data *bd; |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 647 | unsigned i; |
| 648 | enum { |
| 649 | BZh0 = ('B' << 24) + ('Z' << 16) + ('h' << 8) + '0' |
| 650 | }; |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 651 | |
| 652 | /* Figure out how much data to allocate */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 653 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 654 | i = sizeof(bunzip_data); |
| 655 | if (in_fd != -1) i += IOBUF_SIZE; |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 656 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 657 | /* Allocate bunzip_data. Most fields initialize to zero. */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 658 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 659 | bd = *bdp = xzalloc(i); |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 660 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 661 | /* Setup input buffer */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 662 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 663 | bd->in_fd = in_fd; |
| 664 | if (-1 == in_fd) { |
Denis Vlasenko | c6758a0 | 2007-04-10 21:40:19 +0000 | [diff] [blame] | 665 | /* in this case, bd->inbuf is read-only */ |
| 666 | bd->inbuf = (void*)inbuf; /* cast away const-ness */ |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 667 | bd->inbufCount = len; |
| 668 | } else |
| 669 | bd->inbuf = (unsigned char *)(bd + 1); |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 670 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 671 | /* Init the CRC32 table (big endian) */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 672 | |
Denis Vlasenko | c6758a0 | 2007-04-10 21:40:19 +0000 | [diff] [blame] | 673 | crc32_filltable(bd->crc32Table, 1); |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 674 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 675 | /* Setup for I/O error handling via longjmp */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 676 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 677 | i = setjmp(bd->jmpbuf); |
| 678 | if (i) return i; |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 679 | |
| 680 | /* Ensure that file starts with "BZh['1'-'9']." */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 681 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 682 | i = get_bits(bd, 32); |
Denis Vlasenko | c6758a0 | 2007-04-10 21:40:19 +0000 | [diff] [blame] | 683 | if ((unsigned)(i - BZh0 - 1) >= 9) return RETVAL_NOT_BZIP_DATA; |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 684 | |
| 685 | /* Fourth byte (ascii '1'-'9'), indicates block size in units of 100k of |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 686 | uncompressed data. Allocate intermediate buffer for block. */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 687 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 688 | bd->dbufSize = 100000 * (i - BZh0); |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 689 | |
Denis Vlasenko | c6758a0 | 2007-04-10 21:40:19 +0000 | [diff] [blame] | 690 | /* Cannot use xmalloc - may leak bd in NOFORK case! */ |
| 691 | bd->dbuf = malloc_or_warn(bd->dbufSize * sizeof(int)); |
| 692 | if (!bd->dbuf) { |
| 693 | free(bd); |
| 694 | xfunc_die(); |
| 695 | } |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 696 | return RETVAL_OK; |
| 697 | } |
| 698 | |
Denis Vlasenko | c6758a0 | 2007-04-10 21:40:19 +0000 | [diff] [blame] | 699 | void dealloc_bunzip(bunzip_data *bd) |
| 700 | { |
Denis Vlasenko | 4b924f3 | 2007-05-30 00:29:55 +0000 | [diff] [blame] | 701 | free(bd->dbuf); |
| 702 | free(bd); |
Denis Vlasenko | c6758a0 | 2007-04-10 21:40:19 +0000 | [diff] [blame] | 703 | } |
| 704 | |
| 705 | |
| 706 | /* Decompress src_fd to dst_fd. Stops at end of bzip data, not end of file. */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 707 | |
Denis Vlasenko | 97a8dd3 | 2006-10-01 15:55:11 +0000 | [diff] [blame] | 708 | USE_DESKTOP(long long) int |
Denis Vlasenko | c14d39e | 2007-06-08 13:05:39 +0000 | [diff] [blame] | 709 | unpack_bz2_stream(int src_fd, int dst_fd) |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 710 | { |
Denis Vlasenko | 97a8dd3 | 2006-10-01 15:55:11 +0000 | [diff] [blame] | 711 | USE_DESKTOP(long long total_written = 0;) |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 712 | char *outbuf; |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 713 | bunzip_data *bd; |
| 714 | int i; |
| 715 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 716 | outbuf = xmalloc(IOBUF_SIZE); |
Denis Vlasenko | c6758a0 | 2007-04-10 21:40:19 +0000 | [diff] [blame] | 717 | i = start_bunzip(&bd, src_fd, NULL, 0); |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 718 | if (!i) { |
Denis Vlasenko | bf0a201 | 2006-12-26 10:42:51 +0000 | [diff] [blame] | 719 | for (;;) { |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 720 | i = read_bunzip(bd, outbuf, IOBUF_SIZE); |
| 721 | if (i <= 0) break; |
Denis Vlasenko | 52a4388 | 2007-10-10 20:53:41 +0000 | [diff] [blame] | 722 | if (i != full_write(dst_fd, outbuf, i)) { |
| 723 | i = RETVAL_SHORT_WRITE; |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 724 | break; |
| 725 | } |
Denis Vlasenko | 97a8dd3 | 2006-10-01 15:55:11 +0000 | [diff] [blame] | 726 | USE_DESKTOP(total_written += i;) |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 727 | } |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 728 | } |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 729 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 730 | /* Check CRC and release memory */ |
Rob Landley | f856eab | 2006-02-17 03:43:49 +0000 | [diff] [blame] | 731 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 732 | if (i == RETVAL_LAST_BLOCK) { |
| 733 | if (bd->headerCRC != bd->totalCRC) { |
Denis Vlasenko | 66bbfbd | 2007-09-28 23:45:56 +0000 | [diff] [blame] | 734 | bb_error_msg("CRC error"); |
Glenn L McGrath | 1c83440 | 2003-10-28 23:32:12 +0000 | [diff] [blame] | 735 | } else { |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 736 | i = RETVAL_OK; |
Glenn L McGrath | 1c83440 | 2003-10-28 23:32:12 +0000 | [diff] [blame] | 737 | } |
Denis Vlasenko | 52a4388 | 2007-10-10 20:53:41 +0000 | [diff] [blame] | 738 | } else if (i == RETVAL_SHORT_WRITE) { |
| 739 | bb_error_msg("short write"); |
Glenn L McGrath | 1c83440 | 2003-10-28 23:32:12 +0000 | [diff] [blame] | 740 | } else { |
Denis Vlasenko | 66bbfbd | 2007-09-28 23:45:56 +0000 | [diff] [blame] | 741 | bb_error_msg("bunzip error %d", i); |
Glenn L McGrath | 1c83440 | 2003-10-28 23:32:12 +0000 | [diff] [blame] | 742 | } |
Denis Vlasenko | c6758a0 | 2007-04-10 21:40:19 +0000 | [diff] [blame] | 743 | dealloc_bunzip(bd); |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 744 | free(outbuf); |
Glenn L McGrath | 1c83440 | 2003-10-28 23:32:12 +0000 | [diff] [blame] | 745 | |
Denis Vlasenko | 97a8dd3 | 2006-10-01 15:55:11 +0000 | [diff] [blame] | 746 | return i ? i : USE_DESKTOP(total_written) + 0; |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 747 | } |
| 748 | |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 749 | #ifdef TESTING |
Glenn L McGrath | 60bce49 | 2002-11-03 07:28:38 +0000 | [diff] [blame] | 750 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 751 | static char *const bunzip_errors[] = { |
| 752 | NULL, "Bad file checksum", "Not bzip data", |
| 753 | "Unexpected input EOF", "Unexpected output EOF", "Data error", |
| 754 | "Out of memory", "Obsolete (pre 0.9.5) bzip format not supported" |
| 755 | }; |
Glenn L McGrath | 237ae42 | 2002-11-03 14:05:15 +0000 | [diff] [blame] | 756 | |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 757 | /* Dumb little test thing, decompress stdin to stdout */ |
Bernhard Reutner-Fischer | febe3c4 | 2007-04-04 20:52:03 +0000 | [diff] [blame] | 758 | int main(int argc, char **argv) |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 759 | { |
Denis Vlasenko | c14d39e | 2007-06-08 13:05:39 +0000 | [diff] [blame] | 760 | int i = unpack_bz2_stream(0, 1); |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 761 | char c; |
| 762 | |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 763 | if (i < 0) |
| 764 | fprintf(stderr,"%s\n", bunzip_errors[-i]); |
Bernhard Reutner-Fischer | 5e25ddb | 2008-05-19 09:48:17 +0000 | [diff] [blame^] | 765 | else if (read(STDIN_FILENO, &c, 1)) |
Denis Vlasenko | b38cf3f | 2007-04-10 17:16:33 +0000 | [diff] [blame] | 766 | fprintf(stderr,"Trailing garbage ignored\n"); |
Eric Andersen | 5fa4db2 | 2003-10-23 06:52:01 +0000 | [diff] [blame] | 767 | return -i; |
Eric Andersen | 0d6d88a | 2003-10-18 01:58:35 +0000 | [diff] [blame] | 768 | } |
| 769 | #endif |