2003-10-18 07:28:35 +05:30
|
|
|
/* vi: set sw=4 ts=4: */
|
2017-10-05 19:03:28 +05:30
|
|
|
/*
|
|
|
|
* Small bzip2 deflate implementation, by Rob Landley (rob@landley.net).
|
2017-10-05 18:10:24 +05:30
|
|
|
*
|
|
|
|
* Based on bzip2 decompression code by Julian R Seward (jseward@acm.org),
|
|
|
|
* which also acknowledges contributions by Mike Burrows, David Wheeler,
|
|
|
|
* Peter Fenwick, Alistair Moffat, Radford Neal, Ian H. Witten,
|
|
|
|
* Robert Sedgewick, and Jon L. Bentley.
|
|
|
|
*
|
|
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
|
|
|
*/
|
2003-10-23 12:22:01 +05:30
|
|
|
/*
|
|
|
|
Size and speed optimizations by Manuel Novoa III (mjn3@codepoet.org).
|
|
|
|
|
2004-04-14 23:21:38 +05:30
|
|
|
More efficient reading of Huffman codes, a streamlined read_bunzip()
|
2003-10-23 12:22:01 +05:30
|
|
|
function, and various other tweaks. In (limited) tests, approximately
|
|
|
|
20% faster than bzcat on x86 and about 10% faster on arm.
|
|
|
|
|
2010-10-29 19:35:05 +05:30
|
|
|
Note that about 2/3 of the time is spent in read_bunzip() reversing
|
2003-10-23 12:22:01 +05:30
|
|
|
the Burrows-Wheeler transformation. Much of that time is delay
|
|
|
|
resulting from cache misses.
|
|
|
|
|
2010-10-29 22:56:38 +05:30
|
|
|
(2010 update by vda: profiled "bzcat <84mbyte.bz2 >/dev/null"
|
|
|
|
on x86-64 CPU with L2 > 1M: get_next_block is hotter than read_bunzip:
|
|
|
|
%time seconds calls function
|
|
|
|
71.01 12.69 444 get_next_block
|
|
|
|
28.65 5.12 93065 read_bunzip
|
|
|
|
00.22 0.04 7736490 get_bits
|
|
|
|
00.11 0.02 47 dealloc_bunzip
|
|
|
|
00.00 0.00 93018 full_write
|
|
|
|
...)
|
|
|
|
|
|
|
|
|
2003-10-23 12:22:01 +05:30
|
|
|
I would ask that anyone benefiting from this work, especially those
|
|
|
|
using it in commercial products, consider making a donation to my local
|
2006-02-17 09:13:49 +05:30
|
|
|
non-profit hospice organization (www.hospiceacadiana.com) in the name of
|
2006-04-03 03:20:01 +05:30
|
|
|
the woman I loved, Toni W. Hagan, who passed away Feb. 12, 2003.
|
2003-10-23 12:22:01 +05:30
|
|
|
|
|
|
|
Manuel
|
|
|
|
*/
|
2003-10-29 05:02:12 +05:30
|
|
|
#include "libbb.h"
|
2011-09-22 16:15:14 +05:30
|
|
|
#include "bb_archive.h"
|
2006-04-03 03:20:01 +05:30
|
|
|
|
2013-10-07 02:23:14 +05:30
|
|
|
#if 0
|
|
|
|
# define dbg(...) bb_error_msg(__VA_ARGS__)
|
|
|
|
#else
|
|
|
|
# define dbg(...) ((void)0)
|
|
|
|
#endif
|
|
|
|
|
2004-04-14 23:21:38 +05:30
|
|
|
/* Constants for Huffman coding */
|
2006-12-26 16:12:51 +05:30
|
|
|
#define MAX_GROUPS 6
|
|
|
|
#define GROUP_SIZE 50 /* 64 would have been more efficient */
|
|
|
|
#define MAX_HUFCODE_BITS 20 /* Longest Huffman code allowed */
|
|
|
|
#define MAX_SYMBOLS 258 /* 256 literals + RUNA + RUNB */
|
|
|
|
#define SYMBOL_RUNA 0
|
|
|
|
#define SYMBOL_RUNB 1
|
2003-10-18 07:28:35 +05:30
|
|
|
|
|
|
|
/* Status return values */
|
2006-12-26 16:12:51 +05:30
|
|
|
#define RETVAL_OK 0
|
2013-10-07 02:23:14 +05:30
|
|
|
#define RETVAL_LAST_BLOCK (dbg("%d", __LINE__), -1)
|
|
|
|
#define RETVAL_NOT_BZIP_DATA (dbg("%d", __LINE__), -2)
|
|
|
|
#define RETVAL_UNEXPECTED_INPUT_EOF (dbg("%d", __LINE__), -3)
|
|
|
|
#define RETVAL_SHORT_WRITE (dbg("%d", __LINE__), -4)
|
|
|
|
#define RETVAL_DATA_ERROR (dbg("%d", __LINE__), -5)
|
|
|
|
#define RETVAL_OUT_OF_MEMORY (dbg("%d", __LINE__), -6)
|
|
|
|
#define RETVAL_OBSOLETE_INPUT (dbg("%d", __LINE__), -7)
|
2003-10-18 07:28:35 +05:30
|
|
|
|
|
|
|
/* Other housekeeping constants */
|
2006-12-26 16:12:51 +05:30
|
|
|
#define IOBUF_SIZE 4096
|
2003-10-18 07:28:35 +05:30
|
|
|
|
2004-04-14 23:21:38 +05:30
|
|
|
/* This is what we know about each Huffman coding group */
|
2003-10-18 07:28:35 +05:30
|
|
|
struct group_data {
|
2007-10-11 02:23:41 +05:30
|
|
|
/* We have an extra slot at the end of limit[] for a sentinel value. */
|
2007-04-10 22:46:33 +05:30
|
|
|
int limit[MAX_HUFCODE_BITS+1], base[MAX_HUFCODE_BITS], permute[MAX_SYMBOLS];
|
2003-10-23 12:22:01 +05:30
|
|
|
int minLen, maxLen;
|
2002-11-03 12:58:38 +05:30
|
|
|
};
|
|
|
|
|
2003-10-18 07:28:35 +05:30
|
|
|
/* Structure holding all the housekeeping data, including IO buffers and
|
2007-10-11 02:23:41 +05:30
|
|
|
* memory that persists between calls to bunzip
|
|
|
|
* Found the most used member:
|
|
|
|
* cat this_file.c | sed -e 's/"/ /g' -e "s/'/ /g" | xargs -n1 \
|
|
|
|
* | grep 'bd->' | sed 's/^.*bd->/bd->/' | sort | $PAGER
|
|
|
|
* and moved it (inbufBitCount) to offset 0.
|
|
|
|
*/
|
2007-04-11 03:10:19 +05:30
|
|
|
struct bunzip_data {
|
2003-10-23 12:22:01 +05:30
|
|
|
/* I/O tracking data (file handles, buffers, positions, etc.) */
|
2007-10-11 02:23:41 +05:30
|
|
|
unsigned inbufBitCount, inbufBits;
|
2007-04-10 22:46:33 +05:30
|
|
|
int in_fd, out_fd, inbufCount, inbufPos /*, outbufPos*/;
|
2010-10-29 19:35:05 +05:30
|
|
|
uint8_t *inbuf /*,*outbuf*/;
|
2007-10-11 02:23:41 +05:30
|
|
|
|
|
|
|
/* State for interrupting output loop */
|
2010-10-29 19:35:05 +05:30
|
|
|
int writeCopies, writePos, writeRunCountdown, writeCount;
|
|
|
|
int writeCurrent; /* actually a uint8_t */
|
2006-02-17 09:13:49 +05:30
|
|
|
|
2003-10-18 07:28:35 +05:30
|
|
|
/* The CRC values stored in the block header and calculated from the data */
|
2006-04-10 22:37:15 +05:30
|
|
|
uint32_t headerCRC, totalCRC, writeCRC;
|
2006-02-17 09:13:49 +05:30
|
|
|
|
2007-04-11 03:10:19 +05:30
|
|
|
/* Intermediate buffer and its size (in bytes) */
|
2010-10-29 19:35:05 +05:30
|
|
|
uint32_t *dbuf;
|
|
|
|
unsigned dbufSize;
|
2006-02-17 09:13:49 +05:30
|
|
|
|
2007-04-11 03:10:19 +05:30
|
|
|
/* For I/O error handling */
|
2018-04-08 23:32:01 +05:30
|
|
|
jmp_buf *jmpbuf;
|
2006-02-17 09:13:49 +05:30
|
|
|
|
2007-10-11 02:23:41 +05:30
|
|
|
/* Big things go last (register-relative addressing can be larger for big offsets) */
|
2007-04-11 03:10:19 +05:30
|
|
|
uint32_t crc32Table[256];
|
2010-10-29 19:35:05 +05:30
|
|
|
uint8_t selectors[32768]; /* nSelectors=15 bits */
|
2010-10-29 15:16:52 +05:30
|
|
|
struct group_data groups[MAX_GROUPS]; /* Huffman coding tables */
|
2007-04-11 03:10:19 +05:30
|
|
|
};
|
2018-11-02 18:44:31 +05:30
|
|
|
typedef struct bunzip_data bunzip_data;
|
2006-02-17 09:13:49 +05:30
|
|
|
|
2003-10-18 07:28:35 +05:30
|
|
|
|
|
|
|
/* Return the next nnn bits of input. All reads from the compressed input
|
|
|
|
are done through this function. All reads are big endian */
|
2007-10-11 02:23:41 +05:30
|
|
|
static unsigned get_bits(bunzip_data *bd, int bits_wanted)
|
2002-11-03 12:58:38 +05:30
|
|
|
{
|
2007-04-10 22:46:33 +05:30
|
|
|
unsigned bits = 0;
|
2010-10-29 19:35:05 +05:30
|
|
|
/* Cache bd->inbufBitCount in a CPU register (hopefully): */
|
|
|
|
int bit_count = bd->inbufBitCount;
|
2003-10-18 07:28:35 +05:30
|
|
|
|
|
|
|
/* If we need to get more data from the byte buffer, do so. (Loop getting
|
|
|
|
one byte at a time to enforce endianness and avoid unaligned access.) */
|
2010-10-29 19:35:05 +05:30
|
|
|
while (bit_count < bits_wanted) {
|
2006-02-17 09:13:49 +05:30
|
|
|
|
2003-10-18 07:28:35 +05:30
|
|
|
/* If we need to read more data from file into byte buffer, do so */
|
2007-04-10 22:46:33 +05:30
|
|
|
if (bd->inbufPos == bd->inbufCount) {
|
2007-04-11 03:10:19 +05:30
|
|
|
/* if "no input fd" case: in_fd == -1, read fails, we jump */
|
2007-04-10 22:46:33 +05:30
|
|
|
bd->inbufCount = read(bd->in_fd, bd->inbuf, IOBUF_SIZE);
|
|
|
|
if (bd->inbufCount <= 0)
|
2018-04-08 23:32:01 +05:30
|
|
|
longjmp(*bd->jmpbuf, RETVAL_UNEXPECTED_INPUT_EOF);
|
2007-04-10 22:46:33 +05:30
|
|
|
bd->inbufPos = 0;
|
2002-11-03 12:58:38 +05:30
|
|
|
}
|
2006-02-17 09:13:49 +05:30
|
|
|
|
2003-10-18 07:28:35 +05:30
|
|
|
/* Avoid 32-bit overflow (dump bit buffer to top of output) */
|
2010-10-29 19:35:05 +05:30
|
|
|
if (bit_count >= 24) {
|
2017-02-02 00:05:13 +05:30
|
|
|
bits = bd->inbufBits & ((1U << bit_count) - 1);
|
2010-10-29 19:35:05 +05:30
|
|
|
bits_wanted -= bit_count;
|
2007-04-10 22:46:33 +05:30
|
|
|
bits <<= bits_wanted;
|
2010-10-29 19:35:05 +05:30
|
|
|
bit_count = 0;
|
2002-11-03 12:58:38 +05:30
|
|
|
}
|
2006-02-17 09:13:49 +05:30
|
|
|
|
2003-10-18 07:28:35 +05:30
|
|
|
/* Grab next 8 bits of input from buffer. */
|
2007-10-11 02:23:41 +05:30
|
|
|
bd->inbufBits = (bd->inbufBits << 8) | bd->inbuf[bd->inbufPos++];
|
2010-10-29 19:35:05 +05:30
|
|
|
bit_count += 8;
|
2002-11-03 12:58:38 +05:30
|
|
|
}
|
2006-02-17 09:13:49 +05:30
|
|
|
|
2003-10-18 07:28:35 +05:30
|
|
|
/* Calculate result */
|
2010-10-29 19:35:05 +05:30
|
|
|
bit_count -= bits_wanted;
|
|
|
|
bd->inbufBitCount = bit_count;
|
|
|
|
bits |= (bd->inbufBits >> bit_count) & ((1 << bits_wanted) - 1);
|
2002-11-03 12:58:38 +05:30
|
|
|
|
2003-10-18 07:28:35 +05:30
|
|
|
return bits;
|
2002-11-03 12:58:38 +05:30
|
|
|
}
|
2018-04-08 23:32:01 +05:30
|
|
|
//#define get_bits(bd, n) (dbg("%d:get_bits()", __LINE__), get_bits(bd, n))
|
2002-11-03 12:58:38 +05:30
|
|
|
|
2010-10-29 19:35:05 +05:30
|
|
|
/* Unpacks the next block and sets up for the inverse Burrows-Wheeler step. */
|
2003-10-23 12:22:01 +05:30
|
|
|
static int get_next_block(bunzip_data *bd)
|
2002-11-03 12:58:38 +05:30
|
|
|
{
|
2018-04-08 23:32:01 +05:30
|
|
|
int groupCount, selector,
|
2017-10-22 21:53:23 +05:30
|
|
|
i, j, symCount, symTotal, nSelectors, byteCount[256];
|
2010-10-29 19:35:05 +05:30
|
|
|
uint8_t uc, symToByte[256], mtfSymbol[256], *selectors;
|
|
|
|
uint32_t *dbuf;
|
2017-02-02 00:05:13 +05:30
|
|
|
unsigned origPtr, t;
|
2017-10-22 21:53:23 +05:30
|
|
|
unsigned dbufCount, runPos;
|
|
|
|
unsigned runCnt = runCnt; /* for compiler */
|
2003-10-18 07:28:35 +05:30
|
|
|
|
2007-04-10 22:46:33 +05:30
|
|
|
dbuf = bd->dbuf;
|
|
|
|
selectors = bd->selectors;
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2010-10-30 04:24:10 +05:30
|
|
|
/* In bbox, we are ok with aborting through setjmp which is set up in start_bunzip */
|
|
|
|
#if 0
|
2003-10-23 12:22:01 +05:30
|
|
|
/* Reset longjmp I/O error handling */
|
2007-04-10 22:46:33 +05:30
|
|
|
i = setjmp(bd->jmpbuf);
|
2006-12-26 16:12:51 +05:30
|
|
|
if (i) return i;
|
2010-10-30 04:24:10 +05:30
|
|
|
#endif
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2003-10-23 12:22:01 +05:30
|
|
|
/* Read in header signature and CRC, then validate signature.
|
|
|
|
(last block signature means CRC is for whole file, return now) */
|
2007-04-10 22:46:33 +05:30
|
|
|
i = get_bits(bd, 24);
|
|
|
|
j = get_bits(bd, 24);
|
|
|
|
bd->headerCRC = get_bits(bd, 32);
|
2018-04-08 23:32:01 +05:30
|
|
|
if ((i == 0x177245) && (j == 0x385090))
|
|
|
|
return RETVAL_LAST_BLOCK;
|
|
|
|
if ((i != 0x314159) || (j != 0x265359))
|
|
|
|
return RETVAL_NOT_BZIP_DATA;
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2003-10-18 07:28:35 +05:30
|
|
|
/* We can add support for blockRandomised if anybody complains. There was
|
|
|
|
some code for this in busybox 1.0.0-pre3, but nobody ever noticed that
|
|
|
|
it didn't actually work. */
|
2018-04-08 23:32:01 +05:30
|
|
|
if (get_bits(bd, 1))
|
|
|
|
return RETVAL_OBSOLETE_INPUT;
|
2007-04-10 22:46:33 +05:30
|
|
|
origPtr = get_bits(bd, 24);
|
2018-04-08 23:32:01 +05:30
|
|
|
if (origPtr > bd->dbufSize)
|
|
|
|
return RETVAL_DATA_ERROR;
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2003-10-18 07:28:35 +05:30
|
|
|
/* mapping table: if some byte values are never used (encoding things
|
|
|
|
like ascii text), the compression code removes the gaps to have fewer
|
|
|
|
symbols to deal with, and writes a sparse bitfield indicating which
|
|
|
|
values were present. We make a translation table to convert the symbols
|
|
|
|
back to the corresponding bytes. */
|
2007-04-10 22:46:33 +05:30
|
|
|
symTotal = 0;
|
2010-10-30 04:24:10 +05:30
|
|
|
i = 0;
|
|
|
|
t = get_bits(bd, 16);
|
|
|
|
do {
|
|
|
|
if (t & (1 << 15)) {
|
|
|
|
unsigned inner_map = get_bits(bd, 16);
|
|
|
|
do {
|
|
|
|
if (inner_map & (1 << 15))
|
|
|
|
symToByte[symTotal++] = i;
|
|
|
|
inner_map <<= 1;
|
|
|
|
i++;
|
|
|
|
} while (i & 15);
|
|
|
|
i -= 16;
|
2002-11-03 12:58:38 +05:30
|
|
|
}
|
2010-10-30 04:24:10 +05:30
|
|
|
t <<= 1;
|
|
|
|
i += 16;
|
|
|
|
} while (i < 256);
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2004-04-14 23:21:38 +05:30
|
|
|
/* How many different Huffman coding groups does this block use? */
|
2007-04-10 22:46:33 +05:30
|
|
|
groupCount = get_bits(bd, 3);
|
|
|
|
if (groupCount < 2 || groupCount > MAX_GROUPS)
|
|
|
|
return RETVAL_DATA_ERROR;
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2004-04-14 23:21:38 +05:30
|
|
|
/* nSelectors: Every GROUP_SIZE many symbols we select a new Huffman coding
|
2003-10-18 07:28:35 +05:30
|
|
|
group. Read in the group selector list, which is stored as MTF encoded
|
2003-10-23 12:22:01 +05:30
|
|
|
bit runs. (MTF=Move To Front, as each value is used it's moved to the
|
|
|
|
start of the list.) */
|
2010-10-30 04:24:10 +05:30
|
|
|
for (i = 0; i < groupCount; i++)
|
|
|
|
mtfSymbol[i] = i;
|
2007-04-10 22:46:33 +05:30
|
|
|
nSelectors = get_bits(bd, 15);
|
2010-10-30 04:24:10 +05:30
|
|
|
if (!nSelectors)
|
|
|
|
return RETVAL_DATA_ERROR;
|
2007-04-10 22:46:33 +05:30
|
|
|
for (i = 0; i < nSelectors; i++) {
|
2010-10-30 04:24:10 +05:30
|
|
|
uint8_t tmp_byte;
|
2003-10-18 07:28:35 +05:30
|
|
|
/* Get next value */
|
2010-10-30 04:24:10 +05:30
|
|
|
int n = 0;
|
|
|
|
while (get_bits(bd, 1)) {
|
2019-05-23 18:24:13 +05:30
|
|
|
n++;
|
2018-04-08 23:32:01 +05:30
|
|
|
if (n >= groupCount)
|
|
|
|
return RETVAL_DATA_ERROR;
|
2010-10-30 04:24:10 +05:30
|
|
|
}
|
2003-10-18 07:28:35 +05:30
|
|
|
/* Decode MTF to get the next selector */
|
2010-10-30 04:24:10 +05:30
|
|
|
tmp_byte = mtfSymbol[n];
|
|
|
|
while (--n >= 0)
|
|
|
|
mtfSymbol[n + 1] = mtfSymbol[n];
|
2018-04-08 23:32:01 +05:30
|
|
|
//We catch it later, in the second loop where we use selectors[i].
|
|
|
|
//Maybe this is a better place, though?
|
|
|
|
// if (tmp_byte >= groupCount) {
|
|
|
|
// dbg("%d: selectors[%d]:%d groupCount:%d",
|
|
|
|
// __LINE__, i, tmp_byte, groupCount);
|
|
|
|
// return RETVAL_DATA_ERROR;
|
|
|
|
// }
|
2010-10-30 04:24:10 +05:30
|
|
|
mtfSymbol[0] = selectors[i] = tmp_byte;
|
2002-11-03 12:58:38 +05:30
|
|
|
}
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2004-04-14 23:21:38 +05:30
|
|
|
/* Read the Huffman coding tables for each group, which code for symTotal
|
2003-10-18 07:28:35 +05:30
|
|
|
literal symbols, plus two run symbols (RUNA, RUNB) */
|
2007-04-10 22:46:33 +05:30
|
|
|
symCount = symTotal + 2;
|
|
|
|
for (j = 0; j < groupCount; j++) {
|
2010-10-29 19:35:05 +05:30
|
|
|
uint8_t length[MAX_SYMBOLS];
|
2008-06-28 23:40:09 +05:30
|
|
|
/* 8 bits is ALMOST enough for temp[], see below */
|
|
|
|
unsigned temp[MAX_HUFCODE_BITS+1];
|
2018-04-08 23:32:01 +05:30
|
|
|
struct group_data *hufGroup;
|
|
|
|
int *base, *limit;
|
2010-10-30 04:25:02 +05:30
|
|
|
int minLen, maxLen, pp, len_m1;
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2004-04-14 23:21:38 +05:30
|
|
|
/* Read Huffman code lengths for each symbol. They're stored in
|
2003-10-23 12:22:01 +05:30
|
|
|
a way similar to mtf; record a starting value for the first symbol,
|
2010-10-30 04:25:02 +05:30
|
|
|
and an offset from the previous value for every symbol after that.
|
2003-10-23 12:22:01 +05:30
|
|
|
(Subtracting 1 before the loop and then adding it back at the end is
|
|
|
|
an optimization that makes the test inside the loop simpler: symbol
|
|
|
|
length 0 becomes negative, so an unsigned inequality catches it.) */
|
2010-10-30 04:25:02 +05:30
|
|
|
len_m1 = get_bits(bd, 5) - 1;
|
2003-10-18 07:28:35 +05:30
|
|
|
for (i = 0; i < symCount; i++) {
|
2006-12-26 16:12:51 +05:30
|
|
|
for (;;) {
|
2010-10-30 04:24:10 +05:30
|
|
|
int two_bits;
|
2010-10-30 04:25:02 +05:30
|
|
|
if ((unsigned)len_m1 > (MAX_HUFCODE_BITS-1))
|
2003-10-23 12:22:01 +05:30
|
|
|
return RETVAL_DATA_ERROR;
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2003-10-23 12:22:01 +05:30
|
|
|
/* If first bit is 0, stop. Else second bit indicates whether
|
|
|
|
to increment or decrement the value. Optimization: grab 2
|
|
|
|
bits and unget the second if the first was 0. */
|
2010-10-30 04:24:10 +05:30
|
|
|
two_bits = get_bits(bd, 2);
|
|
|
|
if (two_bits < 2) {
|
2003-10-23 12:22:01 +05:30
|
|
|
bd->inbufBitCount++;
|
|
|
|
break;
|
|
|
|
}
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2003-10-23 12:22:01 +05:30
|
|
|
/* Add one if second bit 1, else subtract 1. Avoids if/else */
|
2010-10-30 04:25:02 +05:30
|
|
|
len_m1 += (((two_bits+1) & 2) - 1);
|
2003-10-18 07:28:35 +05:30
|
|
|
}
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2003-10-23 12:22:01 +05:30
|
|
|
/* Correct for the initial -1, to get the final symbol length */
|
2010-10-30 04:25:02 +05:30
|
|
|
length[i] = len_m1 + 1;
|
2002-11-03 12:58:38 +05:30
|
|
|
}
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2003-10-18 07:28:35 +05:30
|
|
|
/* Find largest and smallest lengths in this group */
|
2007-04-10 22:46:33 +05:30
|
|
|
minLen = maxLen = length[0];
|
2006-12-26 16:12:51 +05:30
|
|
|
for (i = 1; i < symCount; i++) {
|
2018-04-08 23:32:01 +05:30
|
|
|
if (length[i] > maxLen)
|
|
|
|
maxLen = length[i];
|
|
|
|
else if (length[i] < minLen)
|
|
|
|
minLen = length[i];
|
2002-11-03 12:58:38 +05:30
|
|
|
}
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2003-10-18 07:28:35 +05:30
|
|
|
/* Calculate permute[], base[], and limit[] tables from length[].
|
|
|
|
*
|
2004-04-14 23:21:38 +05:30
|
|
|
* permute[] is the lookup table for converting Huffman coded symbols
|
2003-10-18 07:28:35 +05:30
|
|
|
* into decoded symbols. base[] is the amount to subtract from the
|
2004-04-14 23:21:38 +05:30
|
|
|
* value of a Huffman symbol of a given length when using permute[].
|
2003-10-18 07:28:35 +05:30
|
|
|
*
|
|
|
|
* limit[] indicates the largest numerical value a symbol with a given
|
2004-04-14 23:21:38 +05:30
|
|
|
* number of bits can have. This is how the Huffman codes can vary in
|
2003-10-23 12:22:01 +05:30
|
|
|
* length: each code with a value>limit[length] needs another bit.
|
2003-10-18 07:28:35 +05:30
|
|
|
*/
|
2007-04-10 22:46:33 +05:30
|
|
|
hufGroup = bd->groups + j;
|
2003-10-18 07:28:35 +05:30
|
|
|
hufGroup->minLen = minLen;
|
|
|
|
hufGroup->maxLen = maxLen;
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2003-10-18 07:28:35 +05:30
|
|
|
/* Note that minLen can't be smaller than 1, so we adjust the base
|
|
|
|
and limit array pointers so we're not always wasting the first
|
2010-10-30 04:24:10 +05:30
|
|
|
entry. We do this again when using them (during symbol decoding). */
|
2007-04-10 22:46:33 +05:30
|
|
|
base = hufGroup->base - 1;
|
2008-06-28 23:40:09 +05:30
|
|
|
limit = hufGroup->limit - 1;
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2017-04-17 19:43:32 +05:30
|
|
|
/* Calculate permute[]. Concurrently, initialize temp[] and limit[]. */
|
2007-04-10 22:46:33 +05:30
|
|
|
pp = 0;
|
|
|
|
for (i = minLen; i <= maxLen; i++) {
|
2010-10-30 04:24:10 +05:30
|
|
|
int k;
|
2007-04-10 22:46:33 +05:30
|
|
|
temp[i] = limit[i] = 0;
|
2010-10-30 04:24:10 +05:30
|
|
|
for (k = 0; k < symCount; k++)
|
|
|
|
if (length[k] == i)
|
|
|
|
hufGroup->permute[pp++] = k;
|
2003-10-23 12:22:01 +05:30
|
|
|
}
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2003-10-23 12:22:01 +05:30
|
|
|
/* Count symbols coded for at each bit length */
|
2008-06-28 23:40:09 +05:30
|
|
|
/* NB: in pathological cases, temp[8] can end ip being 256.
|
|
|
|
* That's why uint8_t is too small for temp[]. */
|
2018-04-08 23:32:01 +05:30
|
|
|
for (i = 0; i < symCount; i++)
|
|
|
|
temp[length[i]]++;
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2003-10-18 07:28:35 +05:30
|
|
|
/* Calculate limit[] (the largest symbol-coding value at each bit
|
|
|
|
* length, which is (previous limit<<1)+symbols at this level), and
|
|
|
|
* base[] (number of symbols to ignore at each bit length, which is
|
2003-10-23 12:22:01 +05:30
|
|
|
* limit minus the cumulative count of symbols coded for already). */
|
2007-04-10 22:46:33 +05:30
|
|
|
pp = t = 0;
|
2010-10-30 04:24:10 +05:30
|
|
|
for (i = minLen; i < maxLen;) {
|
|
|
|
unsigned temp_i = temp[i];
|
|
|
|
|
|
|
|
pp += temp_i;
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2003-10-23 12:22:01 +05:30
|
|
|
/* We read the largest possible symbol size and then unget bits
|
|
|
|
after determining how many we need, and those extra bits could
|
|
|
|
be set to anything. (They're noise from future symbols.) At
|
|
|
|
each level we're really only interested in the first few bits,
|
|
|
|
so here we set all the trailing to-be-ignored bits to 1 so they
|
|
|
|
don't affect the value>limit[length] comparison. */
|
2007-04-10 22:46:33 +05:30
|
|
|
limit[i] = (pp << (maxLen - i)) - 1;
|
|
|
|
pp <<= 1;
|
2010-10-30 04:24:10 +05:30
|
|
|
t += temp_i;
|
|
|
|
base[++i] = pp - t;
|
2002-11-03 12:58:38 +05:30
|
|
|
}
|
2007-04-10 22:46:33 +05:30
|
|
|
limit[maxLen] = pp + temp[maxLen] - 1;
|
2010-10-30 04:25:02 +05:30
|
|
|
limit[maxLen+1] = INT_MAX; /* Sentinel value for reading next sym. */
|
2007-04-10 22:46:33 +05:30
|
|
|
base[minLen] = 0;
|
2003-10-18 07:28:35 +05:30
|
|
|
}
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2003-10-18 07:28:35 +05:30
|
|
|
/* We've finished reading and digesting the block header. Now read this
|
2004-04-14 23:21:38 +05:30
|
|
|
block's Huffman coded symbols from the file and undo the Huffman coding
|
2007-10-11 02:23:41 +05:30
|
|
|
and run length encoding, saving the result into dbuf[dbufCount++] = uc */
|
2003-10-18 07:28:35 +05:30
|
|
|
|
2003-10-23 12:22:01 +05:30
|
|
|
/* Initialize symbol occurrence counters and symbol Move To Front table */
|
2010-10-30 04:24:10 +05:30
|
|
|
/*memset(byteCount, 0, sizeof(byteCount)); - smaller, but slower */
|
2007-04-10 22:46:33 +05:30
|
|
|
for (i = 0; i < 256; i++) {
|
2010-10-30 04:24:10 +05:30
|
|
|
byteCount[i] = 0;
|
2010-10-29 19:35:05 +05:30
|
|
|
mtfSymbol[i] = (uint8_t)i;
|
2003-10-23 12:22:01 +05:30
|
|
|
}
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2003-10-23 12:22:01 +05:30
|
|
|
/* Loop through compressed symbols. */
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2007-04-10 22:46:33 +05:30
|
|
|
runPos = dbufCount = selector = 0;
|
2006-12-26 16:12:51 +05:30
|
|
|
for (;;) {
|
2018-04-08 23:32:01 +05:30
|
|
|
struct group_data *hufGroup;
|
|
|
|
int *base, *limit;
|
2010-10-30 04:24:10 +05:30
|
|
|
int nextSym;
|
2018-04-08 23:32:01 +05:30
|
|
|
uint8_t ngrp;
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2008-06-28 23:40:09 +05:30
|
|
|
/* Fetch next Huffman coding group from list. */
|
2007-04-10 22:46:33 +05:30
|
|
|
symCount = GROUP_SIZE - 1;
|
2018-04-08 23:32:01 +05:30
|
|
|
if (selector >= nSelectors)
|
|
|
|
return RETVAL_DATA_ERROR;
|
|
|
|
ngrp = selectors[selector++];
|
|
|
|
if (ngrp >= groupCount) {
|
|
|
|
dbg("%d selectors[%d]:%d groupCount:%d",
|
|
|
|
__LINE__, selector-1, ngrp, groupCount);
|
|
|
|
return RETVAL_DATA_ERROR;
|
|
|
|
}
|
|
|
|
hufGroup = bd->groups + ngrp;
|
2007-04-10 22:46:33 +05:30
|
|
|
base = hufGroup->base - 1;
|
2008-06-28 23:40:09 +05:30
|
|
|
limit = hufGroup->limit - 1;
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2010-10-30 04:24:10 +05:30
|
|
|
continue_this_group:
|
2004-04-14 23:21:38 +05:30
|
|
|
/* Read next Huffman-coded symbol. */
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2003-10-23 12:22:01 +05:30
|
|
|
/* Note: It is far cheaper to read maxLen bits and back up than it is
|
2010-10-30 04:24:10 +05:30
|
|
|
to read minLen bits and then add additional bit at a time, testing
|
2003-10-23 12:22:01 +05:30
|
|
|
as we go. Because there is a trailing last block (with file CRC),
|
|
|
|
there is no danger of the overread causing an unexpected EOF for a
|
2010-10-30 04:24:10 +05:30
|
|
|
valid compressed file.
|
2003-10-23 12:22:01 +05:30
|
|
|
*/
|
2010-10-30 04:24:10 +05:30
|
|
|
if (1) {
|
|
|
|
/* As a further optimization, we do the read inline
|
|
|
|
(falling back to a call to get_bits if the buffer runs dry).
|
|
|
|
*/
|
|
|
|
int new_cnt;
|
|
|
|
while ((new_cnt = bd->inbufBitCount - hufGroup->maxLen) < 0) {
|
|
|
|
/* bd->inbufBitCount < hufGroup->maxLen */
|
|
|
|
if (bd->inbufPos == bd->inbufCount) {
|
|
|
|
nextSym = get_bits(bd, hufGroup->maxLen);
|
|
|
|
goto got_huff_bits;
|
|
|
|
}
|
|
|
|
bd->inbufBits = (bd->inbufBits << 8) | bd->inbuf[bd->inbufPos++];
|
|
|
|
bd->inbufBitCount += 8;
|
|
|
|
};
|
|
|
|
bd->inbufBitCount = new_cnt; /* "bd->inbufBitCount -= hufGroup->maxLen;" */
|
|
|
|
nextSym = (bd->inbufBits >> new_cnt) & ((1 << hufGroup->maxLen) - 1);
|
|
|
|
got_huff_bits: ;
|
|
|
|
} else { /* unoptimized equivalent */
|
|
|
|
nextSym = get_bits(bd, hufGroup->maxLen);
|
|
|
|
}
|
|
|
|
/* Figure how many bits are in next symbol and unget extras */
|
2007-04-10 22:46:33 +05:30
|
|
|
i = hufGroup->minLen;
|
2018-04-08 23:32:01 +05:30
|
|
|
while (nextSym > limit[i])
|
|
|
|
++i;
|
2010-10-30 04:24:10 +05:30
|
|
|
j = hufGroup->maxLen - i;
|
|
|
|
if (j < 0)
|
|
|
|
return RETVAL_DATA_ERROR;
|
|
|
|
bd->inbufBitCount += j;
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2003-10-23 12:22:01 +05:30
|
|
|
/* Huffman decode value to get nextSym (with bounds checking) */
|
2010-10-30 04:24:10 +05:30
|
|
|
nextSym = (nextSym >> j) - base[i];
|
|
|
|
if ((unsigned)nextSym >= MAX_SYMBOLS)
|
2007-04-10 22:46:33 +05:30
|
|
|
return RETVAL_DATA_ERROR;
|
2010-10-30 04:24:10 +05:30
|
|
|
nextSym = hufGroup->permute[nextSym];
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2003-10-23 12:22:01 +05:30
|
|
|
/* We have now decoded the symbol, which indicates either a new literal
|
|
|
|
byte, or a repeated run of the most recent literal byte. First,
|
|
|
|
check if nextSym indicates a repeated run, and if so loop collecting
|
|
|
|
how many times to repeat the last literal. */
|
2007-04-10 22:46:33 +05:30
|
|
|
if ((unsigned)nextSym <= SYMBOL_RUNB) { /* RUNA or RUNB */
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2003-10-18 07:28:35 +05:30
|
|
|
/* If this is the start of a new run, zero out counter */
|
2010-10-30 04:24:10 +05:30
|
|
|
if (runPos == 0) {
|
2003-10-18 07:28:35 +05:30
|
|
|
runPos = 1;
|
2010-10-30 04:25:02 +05:30
|
|
|
runCnt = 0;
|
2003-10-18 07:28:35 +05:30
|
|
|
}
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2003-10-18 07:28:35 +05:30
|
|
|
/* Neat trick that saves 1 symbol: instead of or-ing 0 or 1 at
|
|
|
|
each bit position, add 1 or 2 instead. For example,
|
|
|
|
1011 is 1<<0 + 1<<1 + 2<<2. 1010 is 2<<0 + 2<<1 + 1<<2.
|
|
|
|
You can make any bit pattern that way using 1 less symbol than
|
|
|
|
the basic or 0/1 method (except all bits 0, which would use no
|
|
|
|
symbols, but a run of length 0 doesn't mean anything in this
|
|
|
|
context). Thus space is saved. */
|
2010-10-30 04:25:02 +05:30
|
|
|
runCnt += (runPos << nextSym); /* +runPos if RUNA; +2*runPos if RUNB */
|
2017-10-22 21:53:23 +05:30
|
|
|
//The 32-bit overflow of runCnt wasn't yet seen, but probably can happen.
|
|
|
|
//This would be the fix (catches too large count way before it can overflow):
|
|
|
|
// if (runCnt > bd->dbufSize) {
|
|
|
|
// dbg("runCnt:%u > dbufSize:%u RETVAL_DATA_ERROR",
|
|
|
|
// runCnt, bd->dbufSize);
|
|
|
|
// return RETVAL_DATA_ERROR;
|
|
|
|
// }
|
|
|
|
if (runPos < bd->dbufSize) runPos <<= 1;
|
2004-11-16 17:37:04 +05:30
|
|
|
goto end_of_huffman_loop;
|
2002-11-03 12:58:38 +05:30
|
|
|
}
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2003-10-18 07:28:35 +05:30
|
|
|
/* When we hit the first non-run symbol after a run, we now know
|
|
|
|
how many times to repeat the last literal, so append that many
|
|
|
|
copies to our buffer of decoded symbols (dbuf) now. (The last
|
|
|
|
literal used is the one at the head of the mtfSymbol array.) */
|
2010-10-30 04:24:10 +05:30
|
|
|
if (runPos != 0) {
|
|
|
|
uint8_t tmp_byte;
|
2017-10-22 21:53:23 +05:30
|
|
|
if (dbufCount + runCnt > bd->dbufSize) {
|
|
|
|
dbg("dbufCount:%u+runCnt:%u %u > dbufSize:%u RETVAL_DATA_ERROR",
|
|
|
|
dbufCount, runCnt, dbufCount + runCnt, bd->dbufSize);
|
2013-10-07 02:23:14 +05:30
|
|
|
return RETVAL_DATA_ERROR;
|
|
|
|
}
|
2010-10-30 04:24:10 +05:30
|
|
|
tmp_byte = symToByte[mtfSymbol[0]];
|
2010-10-30 04:25:02 +05:30
|
|
|
byteCount[tmp_byte] += runCnt;
|
2017-10-22 21:53:23 +05:30
|
|
|
while ((int)--runCnt >= 0)
|
|
|
|
dbuf[dbufCount++] = (uint32_t)tmp_byte;
|
2010-10-30 04:24:10 +05:30
|
|
|
runPos = 0;
|
2003-10-18 07:28:35 +05:30
|
|
|
}
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2003-10-18 07:28:35 +05:30
|
|
|
/* Is this the terminating symbol? */
|
2007-04-10 22:46:33 +05:30
|
|
|
if (nextSym > symTotal) break;
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2003-10-23 12:22:01 +05:30
|
|
|
/* At this point, nextSym indicates a new literal character. Subtract
|
|
|
|
one to get the position in the MTF array at which this literal is
|
|
|
|
currently to be found. (Note that the result can't be -1 or 0,
|
|
|
|
because 0 and 1 are RUNA and RUNB. But another instance of the
|
|
|
|
first symbol in the mtf array, position 0, would have been handled
|
|
|
|
as part of a run above. Therefore 1 unused mtf position minus
|
|
|
|
2 non-literal nextSym values equals -1.) */
|
2017-10-22 21:53:23 +05:30
|
|
|
if (dbufCount >= bd->dbufSize) return RETVAL_DATA_ERROR;
|
2003-10-18 07:28:35 +05:30
|
|
|
i = nextSym - 1;
|
|
|
|
uc = mtfSymbol[i];
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2003-10-23 12:22:01 +05:30
|
|
|
/* Adjust the MTF array. Since we typically expect to move only a
|
|
|
|
* small number of symbols, and are bound by 256 in any case, using
|
|
|
|
* memmove here would typically be bigger and slower due to function
|
|
|
|
* call overhead and other assorted setup costs. */
|
2003-10-18 07:29:46 +05:30
|
|
|
do {
|
|
|
|
mtfSymbol[i] = mtfSymbol[i-1];
|
|
|
|
} while (--i);
|
2003-10-18 07:28:35 +05:30
|
|
|
mtfSymbol[0] = uc;
|
2007-04-10 22:46:33 +05:30
|
|
|
uc = symToByte[uc];
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2003-10-18 07:28:35 +05:30
|
|
|
/* We have our literal byte. Save it into dbuf. */
|
|
|
|
byteCount[uc]++;
|
2010-10-30 04:24:10 +05:30
|
|
|
dbuf[dbufCount++] = (uint32_t)uc;
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2006-02-17 09:13:49 +05:30
|
|
|
/* Skip group initialization if we're not done with this group. Done
|
|
|
|
* this way to avoid compiler warning. */
|
2007-04-10 22:46:33 +05:30
|
|
|
end_of_huffman_loop:
|
2010-10-30 04:24:10 +05:30
|
|
|
if (--symCount >= 0) goto continue_this_group;
|
2002-11-03 12:58:38 +05:30
|
|
|
}
|
2006-02-17 09:13:49 +05:30
|
|
|
|
2004-04-14 23:21:38 +05:30
|
|
|
/* At this point, we've read all the Huffman-coded symbols (and repeated
|
2007-04-10 22:48:12 +05:30
|
|
|
runs) for this block from the input stream, and decoded them into the
|
2003-10-23 12:22:01 +05:30
|
|
|
intermediate buffer. There are dbufCount many decoded bytes in dbuf[].
|
|
|
|
Now undo the Burrows-Wheeler transform on dbuf.
|
2003-10-18 07:28:35 +05:30
|
|
|
See http://dogma.net/markn/articles/bwt/bwt.htm
|
|
|
|
*/
|
2006-02-17 10:42:03 +05:30
|
|
|
|
2003-10-18 07:28:35 +05:30
|
|
|
/* Turn byteCount into cumulative occurrence counts of 0 to n-1. */
|
2007-04-10 22:46:33 +05:30
|
|
|
j = 0;
|
|
|
|
for (i = 0; i < 256; i++) {
|
2010-10-30 04:24:10 +05:30
|
|
|
int tmp_count = j + byteCount[i];
|
2003-10-18 07:28:35 +05:30
|
|
|
byteCount[i] = j;
|
2010-10-30 04:24:10 +05:30
|
|
|
j = tmp_count;
|
2002-11-03 12:58:38 +05:30
|
|
|
}
|
2006-02-17 09:13:49 +05:30
|
|
|
|
2003-10-18 07:28:35 +05:30
|
|
|
/* Figure out what order dbuf would be in if we sorted it. */
|
2007-04-10 22:46:33 +05:30
|
|
|
for (i = 0; i < dbufCount; i++) {
|
2010-10-30 04:24:10 +05:30
|
|
|
uint8_t tmp_byte = (uint8_t)dbuf[i];
|
|
|
|
int tmp_count = byteCount[tmp_byte];
|
|
|
|
dbuf[tmp_count] |= (i << 8);
|
|
|
|
byteCount[tmp_byte] = tmp_count + 1;
|
2002-11-03 12:58:38 +05:30
|
|
|
}
|
2006-02-17 09:13:49 +05:30
|
|
|
|
2003-10-18 07:28:35 +05:30
|
|
|
/* Decode first byte by hand to initialize "previous" byte. Note that it
|
|
|
|
doesn't get output, and if the first three characters are identical
|
2003-10-23 12:22:01 +05:30
|
|
|
it doesn't qualify as a run (hence writeRunCountdown=5). */
|
2007-04-10 22:46:33 +05:30
|
|
|
if (dbufCount) {
|
2010-10-29 19:35:05 +05:30
|
|
|
uint32_t tmp;
|
2008-05-16 03:00:45 +05:30
|
|
|
if ((int)origPtr >= dbufCount) return RETVAL_DATA_ERROR;
|
2010-10-29 19:35:05 +05:30
|
|
|
tmp = dbuf[origPtr];
|
|
|
|
bd->writeCurrent = (uint8_t)tmp;
|
|
|
|
bd->writePos = (tmp >> 8);
|
2007-04-10 22:46:33 +05:30
|
|
|
bd->writeRunCountdown = 5;
|
2002-11-03 12:58:38 +05:30
|
|
|
}
|
2007-04-10 22:46:33 +05:30
|
|
|
bd->writeCount = dbufCount;
|
2002-11-03 12:58:38 +05:30
|
|
|
|
2003-10-18 07:28:35 +05:30
|
|
|
return RETVAL_OK;
|
2002-11-03 12:58:38 +05:30
|
|
|
}
|
|
|
|
|
2010-10-29 19:35:05 +05:30
|
|
|
/* Undo Burrows-Wheeler transform on intermediate buffer to produce output.
|
2003-10-23 12:22:01 +05:30
|
|
|
If start_bunzip was initialized with out_fd=-1, then up to len bytes of
|
|
|
|
data are written to outbuf. Return value is number of bytes written or
|
|
|
|
error (all errors are negative numbers). If out_fd!=-1, outbuf and len
|
|
|
|
are ignored, data is written to out_fd and return is RETVAL_OK or error.
|
2010-10-29 22:31:58 +05:30
|
|
|
|
|
|
|
NB: read_bunzip returns < 0 on error, or the number of *unfilled* bytes
|
|
|
|
in outbuf. IOW: on EOF returns len ("all bytes are not filled"), not 0.
|
|
|
|
(Why? This allows to get rid of one local variable)
|
2003-10-23 12:22:01 +05:30
|
|
|
*/
|
2018-11-02 18:50:54 +05:30
|
|
|
static int read_bunzip(bunzip_data *bd, char *outbuf, int len)
|
2003-10-18 07:28:35 +05:30
|
|
|
{
|
2010-10-29 19:35:05 +05:30
|
|
|
const uint32_t *dbuf;
|
2010-10-29 22:31:58 +05:30
|
|
|
int pos, current, previous;
|
2010-10-29 21:46:29 +05:30
|
|
|
uint32_t CRC;
|
2003-10-18 07:28:35 +05:30
|
|
|
|
2010-10-29 21:46:29 +05:30
|
|
|
/* If we already have error/end indicator, return it */
|
|
|
|
if (bd->writeCount < 0)
|
|
|
|
return bd->writeCount;
|
2003-10-23 12:22:01 +05:30
|
|
|
|
2007-04-10 22:46:33 +05:30
|
|
|
dbuf = bd->dbuf;
|
2010-10-29 21:46:29 +05:30
|
|
|
|
|
|
|
/* Register-cached state (hopefully): */
|
2007-04-10 22:46:33 +05:30
|
|
|
pos = bd->writePos;
|
|
|
|
current = bd->writeCurrent;
|
2010-10-29 21:46:29 +05:30
|
|
|
CRC = bd->writeCRC; /* small loss on x86-32 (not enough regs), win on x86-64 */
|
2003-10-23 12:22:01 +05:30
|
|
|
|
|
|
|
/* We will always have pending decoded data to write into the output
|
|
|
|
buffer unless this is the very first call (in which case we haven't
|
2004-04-14 23:21:38 +05:30
|
|
|
Huffman-decoded a block into the intermediate buffer yet). */
|
2003-10-23 12:22:01 +05:30
|
|
|
if (bd->writeCopies) {
|
2006-02-17 09:13:49 +05:30
|
|
|
|
2010-10-29 19:35:05 +05:30
|
|
|
dec_writeCopies:
|
2003-10-23 12:22:01 +05:30
|
|
|
/* Inside the loop, writeCopies means extra copies (beyond 1) */
|
|
|
|
--bd->writeCopies;
|
2006-02-17 09:13:49 +05:30
|
|
|
|
2003-10-23 12:22:01 +05:30
|
|
|
/* Loop outputting bytes */
|
2006-12-26 16:12:51 +05:30
|
|
|
for (;;) {
|
2006-02-17 09:13:49 +05:30
|
|
|
|
2010-10-29 21:46:29 +05:30
|
|
|
/* If the output buffer is full, save cached state and return */
|
2010-10-29 22:31:58 +05:30
|
|
|
if (--len < 0) {
|
2010-10-29 19:35:05 +05:30
|
|
|
/* Unlikely branch.
|
|
|
|
* Use of "goto" instead of keeping code here
|
|
|
|
* helps compiler to realize this. */
|
|
|
|
goto outbuf_full;
|
2002-11-03 12:58:38 +05:30
|
|
|
}
|
2006-02-17 09:13:49 +05:30
|
|
|
|
2003-10-23 12:22:01 +05:30
|
|
|
/* Write next byte into output buffer, updating CRC */
|
2010-10-29 22:31:58 +05:30
|
|
|
*outbuf++ = current;
|
2010-10-29 21:46:29 +05:30
|
|
|
CRC = (CRC << 8) ^ bd->crc32Table[(CRC >> 24) ^ current];
|
2006-02-17 09:13:49 +05:30
|
|
|
|
2003-10-23 12:22:01 +05:30
|
|
|
/* Loop now if we're outputting multiple copies of this byte */
|
|
|
|
if (bd->writeCopies) {
|
2010-10-29 19:35:05 +05:30
|
|
|
/* Unlikely branch */
|
|
|
|
/*--bd->writeCopies;*/
|
|
|
|
/*continue;*/
|
2010-10-29 21:46:29 +05:30
|
|
|
/* Same, but (ab)using other existing --writeCopies operation
|
|
|
|
* (and this if() compiles into just test+branch pair): */
|
2010-10-29 19:35:05 +05:30
|
|
|
goto dec_writeCopies;
|
2003-10-23 12:22:01 +05:30
|
|
|
}
|
2007-04-10 22:46:33 +05:30
|
|
|
decode_next_byte:
|
2010-10-29 19:35:05 +05:30
|
|
|
if (--bd->writeCount < 0)
|
|
|
|
break; /* input block is fully consumed, need next one */
|
|
|
|
|
2003-10-18 07:28:35 +05:30
|
|
|
/* Follow sequence vector to undo Burrows-Wheeler transform */
|
2007-04-10 22:46:33 +05:30
|
|
|
previous = current;
|
|
|
|
pos = dbuf[pos];
|
2010-10-29 19:35:05 +05:30
|
|
|
current = (uint8_t)pos;
|
2007-04-10 22:46:33 +05:30
|
|
|
pos >>= 8;
|
2006-02-17 09:13:49 +05:30
|
|
|
|
2007-10-11 02:23:41 +05:30
|
|
|
/* After 3 consecutive copies of the same byte, the 4th
|
|
|
|
* is a repeat count. We count down from 4 instead
|
2003-10-23 12:22:01 +05:30
|
|
|
* of counting up because testing for non-zero is faster */
|
2010-10-29 21:46:29 +05:30
|
|
|
if (--bd->writeRunCountdown != 0) {
|
2007-04-10 22:46:33 +05:30
|
|
|
if (current != previous)
|
|
|
|
bd->writeRunCountdown = 4;
|
2003-10-18 07:28:35 +05:30
|
|
|
} else {
|
2010-10-29 19:35:05 +05:30
|
|
|
/* Unlikely branch */
|
2003-10-23 12:22:01 +05:30
|
|
|
/* We have a repeated run, this byte indicates the count */
|
2007-04-10 22:46:33 +05:30
|
|
|
bd->writeCopies = current;
|
|
|
|
current = previous;
|
|
|
|
bd->writeRunCountdown = 5;
|
2006-02-17 09:13:49 +05:30
|
|
|
|
2003-10-23 12:22:01 +05:30
|
|
|
/* Sometimes there are just 3 bytes (run length 0) */
|
2007-04-10 22:46:33 +05:30
|
|
|
if (!bd->writeCopies) goto decode_next_byte;
|
2006-02-17 09:13:49 +05:30
|
|
|
|
2003-10-23 12:22:01 +05:30
|
|
|
/* Subtract the 1 copy we'd output anyway to get extras */
|
|
|
|
--bd->writeCopies;
|
2002-11-03 12:58:38 +05:30
|
|
|
}
|
2022-01-18 05:01:27 +05:30
|
|
|
} /* for (;;) */
|
2006-02-17 09:13:49 +05:30
|
|
|
|
2010-10-29 19:35:05 +05:30
|
|
|
/* Decompression of this input block completed successfully */
|
2010-10-29 21:46:29 +05:30
|
|
|
bd->writeCRC = CRC = ~CRC;
|
|
|
|
bd->totalCRC = ((bd->totalCRC << 1) | (bd->totalCRC >> 31)) ^ CRC;
|
2006-02-17 09:13:49 +05:30
|
|
|
|
2010-10-29 21:46:29 +05:30
|
|
|
/* If this block had a CRC error, force file level CRC error */
|
|
|
|
if (CRC != bd->headerCRC) {
|
2007-10-11 02:23:41 +05:30
|
|
|
bd->totalCRC = bd->headerCRC + 1;
|
2003-10-18 07:28:35 +05:30
|
|
|
return RETVAL_LAST_BLOCK;
|
2002-11-03 12:58:38 +05:30
|
|
|
}
|
|
|
|
}
|
2003-10-23 12:22:01 +05:30
|
|
|
|
2004-04-14 23:21:38 +05:30
|
|
|
/* Refill the intermediate buffer by Huffman-decoding next block of input */
|
2010-10-29 19:35:05 +05:30
|
|
|
{
|
|
|
|
int r = get_next_block(bd);
|
2010-10-29 21:46:29 +05:30
|
|
|
if (r) { /* error/end */
|
2010-10-29 19:35:05 +05:30
|
|
|
bd->writeCount = r;
|
2010-10-29 22:31:58 +05:30
|
|
|
return (r != RETVAL_LAST_BLOCK) ? r : len;
|
2010-10-29 19:35:05 +05:30
|
|
|
}
|
2003-10-23 12:22:01 +05:30
|
|
|
}
|
2010-10-29 19:35:05 +05:30
|
|
|
|
2010-10-29 21:46:29 +05:30
|
|
|
CRC = ~0;
|
2007-04-10 22:46:33 +05:30
|
|
|
pos = bd->writePos;
|
|
|
|
current = bd->writeCurrent;
|
2003-10-23 12:22:01 +05:30
|
|
|
goto decode_next_byte;
|
2010-10-29 19:35:05 +05:30
|
|
|
|
|
|
|
outbuf_full:
|
2010-10-29 21:46:29 +05:30
|
|
|
/* Output buffer is full, save cached state and return */
|
2010-10-29 19:35:05 +05:30
|
|
|
bd->writePos = pos;
|
|
|
|
bd->writeCurrent = current;
|
2010-10-29 21:46:29 +05:30
|
|
|
bd->writeCRC = CRC;
|
|
|
|
|
2010-10-29 19:35:05 +05:30
|
|
|
bd->writeCopies++;
|
2010-10-29 21:46:29 +05:30
|
|
|
|
2010-10-29 22:31:58 +05:30
|
|
|
return 0;
|
2002-11-03 12:58:38 +05:30
|
|
|
}
|
|
|
|
|
2003-10-23 12:22:01 +05:30
|
|
|
/* Allocate the structure, read file header. If in_fd==-1, inbuf must contain
|
|
|
|
a complete bunzip file (len bytes long). If in_fd!=-1, inbuf and len are
|
|
|
|
ignored, and data is read from file handle into temporary buffer. */
|
2006-02-17 09:13:49 +05:30
|
|
|
|
2007-04-11 03:10:19 +05:30
|
|
|
/* Because bunzip2 is used for help text unpacking, and because bb_show_usage()
|
|
|
|
should work for NOFORK applets too, we must be extremely careful to not leak
|
|
|
|
any allocations! */
|
2018-11-02 18:44:31 +05:30
|
|
|
static int FAST_FUNC start_bunzip(
|
2018-04-08 23:32:01 +05:30
|
|
|
void *jmpbuf,
|
|
|
|
bunzip_data **bdp,
|
|
|
|
int in_fd,
|
2010-10-29 02:38:53 +05:30
|
|
|
const void *inbuf, int len)
|
2002-11-03 12:58:38 +05:30
|
|
|
{
|
2003-10-18 07:28:35 +05:30
|
|
|
bunzip_data *bd;
|
2007-04-10 22:46:33 +05:30
|
|
|
unsigned i;
|
|
|
|
enum {
|
2008-08-05 18:40:34 +05:30
|
|
|
BZh0 = ('B' << 24) + ('Z' << 16) + ('h' << 8) + '0',
|
|
|
|
h0 = ('h' << 8) + '0',
|
2007-04-10 22:46:33 +05:30
|
|
|
};
|
2003-10-18 07:28:35 +05:30
|
|
|
|
|
|
|
/* Figure out how much data to allocate */
|
2007-04-10 22:46:33 +05:30
|
|
|
i = sizeof(bunzip_data);
|
2018-04-08 23:32:01 +05:30
|
|
|
if (in_fd != -1)
|
|
|
|
i += IOBUF_SIZE;
|
2006-02-17 09:13:49 +05:30
|
|
|
|
2003-10-18 07:28:35 +05:30
|
|
|
/* Allocate bunzip_data. Most fields initialize to zero. */
|
2007-04-10 22:46:33 +05:30
|
|
|
bd = *bdp = xzalloc(i);
|
2006-02-17 09:13:49 +05:30
|
|
|
|
2018-04-08 23:32:01 +05:30
|
|
|
bd->jmpbuf = jmpbuf;
|
|
|
|
|
2003-10-23 12:22:01 +05:30
|
|
|
/* Setup input buffer */
|
2007-04-10 22:46:33 +05:30
|
|
|
bd->in_fd = in_fd;
|
|
|
|
if (-1 == in_fd) {
|
2007-04-11 03:10:19 +05:30
|
|
|
/* in this case, bd->inbuf is read-only */
|
|
|
|
bd->inbuf = (void*)inbuf; /* cast away const-ness */
|
2010-10-29 02:38:53 +05:30
|
|
|
} else {
|
2010-10-29 19:35:05 +05:30
|
|
|
bd->inbuf = (uint8_t*)(bd + 1);
|
2010-10-29 02:38:53 +05:30
|
|
|
memcpy(bd->inbuf, inbuf, len);
|
|
|
|
}
|
|
|
|
bd->inbufCount = len;
|
2006-02-17 09:13:49 +05:30
|
|
|
|
2003-10-18 07:28:35 +05:30
|
|
|
/* Init the CRC32 table (big endian) */
|
2007-04-11 03:10:19 +05:30
|
|
|
crc32_filltable(bd->crc32Table, 1);
|
2006-02-17 09:13:49 +05:30
|
|
|
|
2003-10-23 12:22:01 +05:30
|
|
|
/* Ensure that file starts with "BZh['1'-'9']." */
|
2008-08-05 18:40:34 +05:30
|
|
|
/* Update: now caller verifies 1st two bytes, makes .gz/.bz2
|
|
|
|
* integration easier */
|
|
|
|
/* was: */
|
|
|
|
/* i = get_bits(bd, 32); */
|
|
|
|
/* if ((unsigned)(i - BZh0 - 1) >= 9) return RETVAL_NOT_BZIP_DATA; */
|
|
|
|
i = get_bits(bd, 16);
|
|
|
|
if ((unsigned)(i - h0 - 1) >= 9) return RETVAL_NOT_BZIP_DATA;
|
2003-10-23 12:22:01 +05:30
|
|
|
|
2008-06-28 23:40:09 +05:30
|
|
|
/* Fourth byte (ascii '1'-'9') indicates block size in units of 100k of
|
2003-10-18 07:28:35 +05:30
|
|
|
uncompressed data. Allocate intermediate buffer for block. */
|
2008-08-05 18:40:34 +05:30
|
|
|
/* bd->dbufSize = 100000 * (i - BZh0); */
|
|
|
|
bd->dbufSize = 100000 * (i - h0);
|
2003-10-23 12:22:01 +05:30
|
|
|
|
2007-04-11 03:10:19 +05:30
|
|
|
/* Cannot use xmalloc - may leak bd in NOFORK case! */
|
2010-10-29 19:35:05 +05:30
|
|
|
bd->dbuf = malloc_or_warn(bd->dbufSize * sizeof(bd->dbuf[0]));
|
2007-04-11 03:10:19 +05:30
|
|
|
if (!bd->dbuf) {
|
|
|
|
free(bd);
|
|
|
|
xfunc_die();
|
|
|
|
}
|
2003-10-18 07:28:35 +05:30
|
|
|
return RETVAL_OK;
|
2002-11-03 12:58:38 +05:30
|
|
|
}
|
|
|
|
|
2018-11-02 18:44:31 +05:30
|
|
|
static void FAST_FUNC dealloc_bunzip(bunzip_data *bd)
|
2007-04-11 03:10:19 +05:30
|
|
|
{
|
2007-05-30 05:59:55 +05:30
|
|
|
free(bd->dbuf);
|
|
|
|
free(bd);
|
2007-04-11 03:10:19 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Decompress src_fd to dst_fd. Stops at end of bzip data, not end of file. */
|
2009-04-21 16:39:40 +05:30
|
|
|
IF_DESKTOP(long long) int FAST_FUNC
|
2014-12-07 05:14:00 +05:30
|
|
|
unpack_bz2_stream(transformer_state_t *xstate)
|
2002-11-03 12:58:38 +05:30
|
|
|
{
|
2009-04-21 16:39:40 +05:30
|
|
|
IF_DESKTOP(long long total_written = 0;)
|
2010-11-01 06:49:47 +05:30
|
|
|
bunzip_data *bd;
|
2003-10-23 12:22:01 +05:30
|
|
|
char *outbuf;
|
2003-10-18 07:28:35 +05:30
|
|
|
int i;
|
2010-10-29 02:38:53 +05:30
|
|
|
unsigned len;
|
2002-11-03 12:58:38 +05:30
|
|
|
|
2014-12-07 05:14:00 +05:30
|
|
|
if (check_signature16(xstate, BZIP2_MAGIC))
|
2012-03-06 20:57:48 +05:30
|
|
|
return -1;
|
|
|
|
|
2007-04-10 22:46:33 +05:30
|
|
|
outbuf = xmalloc(IOBUF_SIZE);
|
2010-10-29 02:38:53 +05:30
|
|
|
len = 0;
|
|
|
|
while (1) { /* "Process one BZ... stream" loop */
|
2018-04-08 23:32:01 +05:30
|
|
|
jmp_buf jmpbuf;
|
2010-10-29 02:38:53 +05:30
|
|
|
|
2018-04-08 23:32:01 +05:30
|
|
|
/* Setup for I/O error handling via longjmp */
|
|
|
|
i = setjmp(jmpbuf);
|
|
|
|
if (i == 0)
|
|
|
|
i = start_bunzip(&jmpbuf, &bd, xstate->src_fd, outbuf + 2, len);
|
2010-10-29 02:38:53 +05:30
|
|
|
|
|
|
|
if (i == 0) {
|
|
|
|
while (1) { /* "Produce some output bytes" loop */
|
|
|
|
i = read_bunzip(bd, outbuf, IOBUF_SIZE);
|
2010-10-29 22:31:58 +05:30
|
|
|
if (i < 0) /* error? */
|
|
|
|
break;
|
|
|
|
i = IOBUF_SIZE - i; /* number of bytes produced */
|
|
|
|
if (i == 0) /* EOF? */
|
2010-10-29 02:38:53 +05:30
|
|
|
break;
|
2014-12-07 05:14:00 +05:30
|
|
|
if (i != transformer_write(xstate, outbuf, i)) {
|
2010-11-01 06:08:54 +05:30
|
|
|
i = RETVAL_SHORT_WRITE;
|
2010-10-29 02:38:53 +05:30
|
|
|
goto release_mem;
|
|
|
|
}
|
|
|
|
IF_DESKTOP(total_written += i;)
|
2003-10-23 12:22:01 +05:30
|
|
|
}
|
|
|
|
}
|
2006-02-17 09:13:49 +05:30
|
|
|
|
2011-10-31 05:35:16 +05:30
|
|
|
if (i != RETVAL_LAST_BLOCK
|
|
|
|
/* Observed case when i == RETVAL_OK:
|
|
|
|
* "bzcat z.bz2", where "z.bz2" is a bzipped zero-length file
|
|
|
|
* (to be exact, z.bz2 is exactly these 14 bytes:
|
2018-11-02 18:50:54 +05:30
|
|
|
* 42 5a 68 39 17 72 45 38 50 90 00 00 00 00).
|
2011-10-31 05:35:16 +05:30
|
|
|
*/
|
|
|
|
&& i != RETVAL_OK
|
|
|
|
) {
|
2010-10-29 02:38:53 +05:30
|
|
|
bb_error_msg("bunzip error %d", i);
|
|
|
|
break;
|
|
|
|
}
|
2007-04-10 22:46:33 +05:30
|
|
|
if (bd->headerCRC != bd->totalCRC) {
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg("CRC error");
|
2010-10-29 02:38:53 +05:30
|
|
|
break;
|
2003-10-29 05:02:12 +05:30
|
|
|
}
|
2010-10-29 02:38:53 +05:30
|
|
|
|
|
|
|
/* Successfully unpacked one BZ stream */
|
|
|
|
i = RETVAL_OK;
|
|
|
|
|
|
|
|
/* Do we have "BZ..." after last processed byte?
|
|
|
|
* pbzip2 (parallelized bzip2) produces such files.
|
|
|
|
*/
|
|
|
|
len = bd->inbufCount - bd->inbufPos;
|
|
|
|
memcpy(outbuf, &bd->inbuf[bd->inbufPos], len);
|
|
|
|
if (len < 2) {
|
2014-12-07 05:14:00 +05:30
|
|
|
if (safe_read(xstate->src_fd, outbuf + len, 2 - len) != 2 - len)
|
2010-10-29 02:38:53 +05:30
|
|
|
break;
|
|
|
|
len = 2;
|
|
|
|
}
|
|
|
|
if (*(uint16_t*)outbuf != BZIP2_MAGIC) /* "BZ"? */
|
|
|
|
break;
|
|
|
|
dealloc_bunzip(bd);
|
|
|
|
len -= 2;
|
2003-10-29 05:02:12 +05:30
|
|
|
}
|
2010-10-29 02:38:53 +05:30
|
|
|
|
|
|
|
release_mem:
|
2007-04-11 03:10:19 +05:30
|
|
|
dealloc_bunzip(bd);
|
2003-10-23 12:22:01 +05:30
|
|
|
free(outbuf);
|
2003-10-29 05:02:12 +05:30
|
|
|
|
2009-04-21 16:39:40 +05:30
|
|
|
return i ? i : IF_DESKTOP(total_written) + 0;
|
2003-10-18 07:28:35 +05:30
|
|
|
}
|
2002-11-03 12:58:38 +05:30
|
|
|
|
2018-11-02 18:44:31 +05:30
|
|
|
char* FAST_FUNC
|
|
|
|
unpack_bz2_data(const char *packed, int packed_len, int unpacked_len)
|
|
|
|
{
|
|
|
|
char *outbuf = NULL;
|
|
|
|
bunzip_data *bd;
|
|
|
|
int i;
|
|
|
|
jmp_buf jmpbuf;
|
|
|
|
|
|
|
|
/* Setup for I/O error handling via longjmp */
|
|
|
|
i = setjmp(jmpbuf);
|
|
|
|
if (i == 0) {
|
|
|
|
i = start_bunzip(&jmpbuf,
|
|
|
|
&bd,
|
|
|
|
/* src_fd: */ -1,
|
|
|
|
/* inbuf: */ packed,
|
|
|
|
/* len: */ packed_len
|
|
|
|
);
|
|
|
|
}
|
|
|
|
/* read_bunzip can longjmp and end up here with i != 0
|
|
|
|
* on read data errors! Not trivial */
|
|
|
|
if (i == 0) {
|
|
|
|
/* Cannot use xmalloc: will leak bd in NOFORK case! */
|
|
|
|
outbuf = malloc_or_warn(unpacked_len);
|
|
|
|
if (outbuf)
|
|
|
|
read_bunzip(bd, outbuf, unpacked_len);
|
|
|
|
}
|
|
|
|
dealloc_bunzip(bd);
|
|
|
|
return outbuf;
|
|
|
|
}
|
|
|
|
|
2003-10-23 12:22:01 +05:30
|
|
|
#ifdef TESTING
|
2002-11-03 19:35:15 +05:30
|
|
|
|
2007-04-10 22:46:33 +05:30
|
|
|
static char *const bunzip_errors[] = {
|
|
|
|
NULL, "Bad file checksum", "Not bzip data",
|
|
|
|
"Unexpected input EOF", "Unexpected output EOF", "Data error",
|
|
|
|
"Out of memory", "Obsolete (pre 0.9.5) bzip format not supported"
|
|
|
|
};
|
2002-11-03 19:35:15 +05:30
|
|
|
|
2003-10-18 07:28:35 +05:30
|
|
|
/* Dumb little test thing, decompress stdin to stdout */
|
2007-04-05 02:22:03 +05:30
|
|
|
int main(int argc, char **argv)
|
2003-10-18 07:28:35 +05:30
|
|
|
{
|
2003-10-23 12:22:01 +05:30
|
|
|
char c;
|
|
|
|
|
2012-03-06 20:57:48 +05:30
|
|
|
int i = unpack_bz2_stream(0, 1);
|
2007-04-10 22:46:33 +05:30
|
|
|
if (i < 0)
|
2008-06-26 20:02:57 +05:30
|
|
|
fprintf(stderr, "%s\n", bunzip_errors[-i]);
|
2008-05-19 15:18:17 +05:30
|
|
|
else if (read(STDIN_FILENO, &c, 1))
|
2008-06-26 20:02:57 +05:30
|
|
|
fprintf(stderr, "Trailing garbage ignored\n");
|
2003-10-23 12:22:01 +05:30
|
|
|
return -i;
|
2003-10-18 07:28:35 +05:30
|
|
|
}
|
|
|
|
#endif
|