2007-10-13 09:06:03 +05:30
|
|
|
/*
|
|
|
|
* Copyright (C) 2007 Denys Vlasenko <vda.linux@googlemail.com>
|
|
|
|
*
|
|
|
|
* This file uses bzip2 library code which is written
|
|
|
|
* by Julian Seward <jseward@bzip.org>.
|
|
|
|
* See README and LICENSE files in bz/ directory for more information
|
|
|
|
* about bzip2 library code.
|
|
|
|
*/
|
2013-11-14 16:09:00 +05:30
|
|
|
//config:config BZIP2
|
2018-12-28 07:50:17 +05:30
|
|
|
//config: bool "bzip2 (16 kb)"
|
2013-11-14 16:09:00 +05:30
|
|
|
//config: default y
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: bzip2 is a compression utility using the Burrows-Wheeler block
|
|
|
|
//config: sorting text compression algorithm, and Huffman coding. Compression
|
|
|
|
//config: is generally considerably better than that achieved by more
|
|
|
|
//config: conventional LZ77/LZ78-based compressors, and approaches the
|
|
|
|
//config: performance of the PPM family of statistical compressors.
|
2013-11-14 16:09:00 +05:30
|
|
|
//config:
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: Unless you have a specific application which requires bzip2, you
|
|
|
|
//config: should probably say N here.
|
2017-01-08 11:58:34 +05:30
|
|
|
//config:
|
2018-02-07 06:03:25 +05:30
|
|
|
//config:config BZIP2_SMALL
|
|
|
|
//config: int "Trade bytes for speed (0:fast, 9:small)"
|
|
|
|
//config: default 8 # all "fast or small" options default to small
|
|
|
|
//config: range 0 9
|
|
|
|
//config: depends on BZIP2
|
|
|
|
//config: help
|
|
|
|
//config: Trade code size versus speed.
|
|
|
|
//config: Approximate values with gcc-6.3.0 "bzip -9" compressing
|
|
|
|
//config: linux-4.15.tar were:
|
|
|
|
//config: value time (sec) code size (386)
|
|
|
|
//config: 9 (smallest) 70.11 7687
|
|
|
|
//config: 8 67.93 8091
|
|
|
|
//config: 7 67.88 8405
|
|
|
|
//config: 6 67.78 8624
|
|
|
|
//config: 5 67.05 9427
|
|
|
|
//config: 4-0 (fastest) 64.14 12083
|
|
|
|
//config:
|
2017-01-08 11:58:34 +05:30
|
|
|
//config:config FEATURE_BZIP2_DECOMPRESS
|
|
|
|
//config: bool "Enable decompression"
|
|
|
|
//config: default y
|
|
|
|
//config: depends on BZIP2 || BUNZIP2 || BZCAT
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: Enable -d (--decompress) and -t (--test) options for bzip2.
|
|
|
|
//config: This will be automatically selected if bunzip2 or bzcat is
|
|
|
|
//config: enabled.
|
2013-11-14 16:09:00 +05:30
|
|
|
|
2013-11-14 14:24:24 +05:30
|
|
|
//applet:IF_BZIP2(APPLET(bzip2, BB_DIR_USR_BIN, BB_SUID_DROP))
|
2017-09-18 19:58:43 +05:30
|
|
|
|
2013-11-14 14:23:52 +05:30
|
|
|
//kbuild:lib-$(CONFIG_BZIP2) += bzip2.o
|
|
|
|
|
2011-03-28 02:10:30 +05:30
|
|
|
//usage:#define bzip2_trivial_usage
|
|
|
|
//usage: "[OPTIONS] [FILE]..."
|
|
|
|
//usage:#define bzip2_full_usage "\n\n"
|
|
|
|
//usage: "Compress FILEs (or stdin) with bzip2 algorithm\n"
|
|
|
|
//usage: "\n -1..9 Compression level"
|
2017-01-08 11:58:34 +05:30
|
|
|
//usage: IF_FEATURE_BZIP2_DECOMPRESS(
|
2011-03-28 02:10:30 +05:30
|
|
|
//usage: "\n -d Decompress"
|
2017-01-08 11:58:34 +05:30
|
|
|
//usage: "\n -t Test file integrity"
|
|
|
|
//usage: )
|
2011-03-28 02:10:30 +05:30
|
|
|
//usage: "\n -c Write to stdout"
|
|
|
|
//usage: "\n -f Force"
|
2017-06-15 21:37:04 +05:30
|
|
|
//usage: "\n -k Keep input files"
|
2011-03-28 02:10:30 +05:30
|
|
|
|
2007-10-13 09:06:03 +05:30
|
|
|
#include "libbb.h"
|
2011-09-22 16:15:14 +05:30
|
|
|
#include "bb_archive.h"
|
2007-10-13 09:06:03 +05:30
|
|
|
|
2018-02-07 06:03:25 +05:30
|
|
|
#if CONFIG_BZIP2_SMALL >= 4
|
|
|
|
#define BZIP2_SPEED (9 - CONFIG_BZIP2_SMALL)
|
|
|
|
#else
|
|
|
|
#define BZIP2_SPEED 5
|
|
|
|
#endif
|
2007-10-14 06:13:01 +05:30
|
|
|
|
|
|
|
/* Speed test:
|
|
|
|
* Compiled with gcc 4.2.1, run on Athlon 64 1800 MHz (512K L2 cache).
|
|
|
|
* Stock bzip2 is 26.4% slower than bbox bzip2 at SPEED 1
|
|
|
|
* (time to compress gcc-4.2.1.tar is 126.4% compared to bbox).
|
|
|
|
* At SPEED 5 difference is 32.7%.
|
|
|
|
*
|
2018-02-07 06:03:25 +05:30
|
|
|
* Test run of all BZIP2_SPEED values on a 11Mb text file:
|
2007-10-14 06:13:01 +05:30
|
|
|
* Size Time (3 runs)
|
|
|
|
* 0: 10828 4.145 4.146 4.148
|
|
|
|
* 1: 11097 3.845 3.860 3.861
|
|
|
|
* 2: 11392 3.763 3.767 3.768
|
|
|
|
* 3: 11892 3.722 3.724 3.727
|
|
|
|
* 4: 12740 3.637 3.640 3.644
|
|
|
|
* 5: 17273 3.497 3.509 3.509
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#define BZ_DEBUG 0
|
|
|
|
/* Takes ~300 bytes, detects corruption caused by bad RAM etc */
|
|
|
|
#define BZ_LIGHT_DEBUG 0
|
2007-10-13 09:06:03 +05:30
|
|
|
|
2010-11-03 07:08:31 +05:30
|
|
|
#include "libarchive/bz/bzlib.h"
|
2007-10-13 09:06:03 +05:30
|
|
|
|
2010-11-03 07:08:31 +05:30
|
|
|
#include "libarchive/bz/bzlib_private.h"
|
2007-10-13 09:06:03 +05:30
|
|
|
|
2010-11-03 07:08:31 +05:30
|
|
|
#include "libarchive/bz/blocksort.c"
|
|
|
|
#include "libarchive/bz/bzlib.c"
|
|
|
|
#include "libarchive/bz/compress.c"
|
|
|
|
#include "libarchive/bz/huffman.c"
|
2007-10-13 09:06:03 +05:30
|
|
|
|
|
|
|
/* No point in being shy and having very small buffer here.
|
|
|
|
* bzip2 internal buffers are much bigger anyway, hundreds of kbytes.
|
|
|
|
* If iobuf is several pages long, malloc() may use mmap,
|
2018-02-01 05:30:58 +05:30
|
|
|
* making iobuf page aligned and thus (maybe) have one memcpy less
|
2007-10-13 09:06:03 +05:30
|
|
|
* if kernel is clever enough.
|
|
|
|
*/
|
|
|
|
enum {
|
|
|
|
IOBUF_SIZE = 8 * 1024
|
|
|
|
};
|
|
|
|
|
2007-10-17 15:44:11 +05:30
|
|
|
/* NB: compressStream() has to return -1 on errors, not die.
|
|
|
|
* bbunpack() will correctly clean up in this case
|
|
|
|
* (delete incomplete .bz2 file)
|
|
|
|
*/
|
|
|
|
|
2007-10-13 09:06:03 +05:30
|
|
|
/* Returns:
|
2007-10-17 15:44:11 +05:30
|
|
|
* -1 on errors
|
|
|
|
* total written bytes so far otherwise
|
2007-10-13 09:06:03 +05:30
|
|
|
*/
|
|
|
|
static
|
2009-04-21 16:39:40 +05:30
|
|
|
IF_DESKTOP(long long) int bz_write(bz_stream *strm, void* rbuf, ssize_t rlen, void *wbuf)
|
2007-10-13 09:06:03 +05:30
|
|
|
{
|
|
|
|
int n, n2, ret;
|
|
|
|
|
|
|
|
strm->avail_in = rlen;
|
2007-10-17 15:44:11 +05:30
|
|
|
strm->next_in = rbuf;
|
2007-10-13 09:06:03 +05:30
|
|
|
while (1) {
|
|
|
|
strm->avail_out = IOBUF_SIZE;
|
|
|
|
strm->next_out = wbuf;
|
|
|
|
|
2007-10-17 15:44:11 +05:30
|
|
|
ret = BZ2_bzCompress(strm, rlen ? BZ_RUN : BZ_FINISH);
|
|
|
|
if (ret != BZ_RUN_OK /* BZ_RUNning */
|
|
|
|
&& ret != BZ_FINISH_OK /* BZ_FINISHing, but not done yet */
|
|
|
|
&& ret != BZ_STREAM_END /* BZ_FINISHed */
|
|
|
|
) {
|
2007-10-13 09:06:03 +05:30
|
|
|
bb_error_msg_and_die("internal error %d", ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
n = IOBUF_SIZE - strm->avail_out;
|
|
|
|
if (n) {
|
|
|
|
n2 = full_write(STDOUT_FILENO, wbuf, n);
|
2007-10-17 15:44:11 +05:30
|
|
|
if (n2 != n) {
|
|
|
|
if (n2 >= 0)
|
|
|
|
errno = 0; /* prevent bogus error message */
|
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_perror_msg(n2 >= 0 ? "short write" : bb_msg_write_error);
|
2007-10-17 15:44:11 +05:30
|
|
|
return -1;
|
|
|
|
}
|
2007-10-13 09:06:03 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
if (ret == BZ_STREAM_END)
|
|
|
|
break;
|
2007-10-17 15:44:11 +05:30
|
|
|
if (rlen && strm->avail_in == 0)
|
|
|
|
break;
|
2007-10-13 09:06:03 +05:30
|
|
|
}
|
2009-04-21 16:39:40 +05:30
|
|
|
return 0 IF_DESKTOP( + strm->total_out );
|
2007-10-13 09:06:03 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
static
|
2014-12-07 05:12:49 +05:30
|
|
|
IF_DESKTOP(long long) int FAST_FUNC compressStream(transformer_state_t *xstate UNUSED_PARAM)
|
2007-10-13 09:06:03 +05:30
|
|
|
{
|
2009-04-21 16:39:40 +05:30
|
|
|
IF_DESKTOP(long long) int total;
|
2018-02-01 05:30:58 +05:30
|
|
|
unsigned opt, level;
|
2007-10-13 09:06:03 +05:30
|
|
|
ssize_t count;
|
|
|
|
bz_stream bzs; /* it's small */
|
|
|
|
#define strm (&bzs)
|
|
|
|
char *iobuf;
|
|
|
|
#define rbuf iobuf
|
|
|
|
#define wbuf (iobuf + IOBUF_SIZE)
|
|
|
|
|
|
|
|
iobuf = xmalloc(2 * IOBUF_SIZE);
|
2018-02-01 05:30:58 +05:30
|
|
|
|
2018-02-01 13:43:14 +05:30
|
|
|
opt = option_mask32 >> (BBUNPK_OPTSTRLEN IF_FEATURE_BZIP2_DECOMPRESS(+ 2) + 2);
|
|
|
|
/* skipped BBUNPK_OPTSTR, "dt" and "zs" bits */
|
2018-02-01 05:30:58 +05:30
|
|
|
opt |= 0x100; /* if nothing else, assume -9 */
|
|
|
|
level = 0;
|
|
|
|
for (;;) {
|
|
|
|
level++;
|
|
|
|
if (opt & 1) break;
|
|
|
|
opt >>= 1;
|
|
|
|
}
|
|
|
|
|
2007-10-14 13:21:19 +05:30
|
|
|
BZ2_bzCompressInit(strm, level);
|
2007-10-13 09:06:03 +05:30
|
|
|
|
|
|
|
while (1) {
|
|
|
|
count = full_read(STDIN_FILENO, rbuf, IOBUF_SIZE);
|
2007-10-17 15:44:11 +05:30
|
|
|
if (count < 0) {
|
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_perror_msg(bb_msg_read_error);
|
2007-10-17 15:44:11 +05:30
|
|
|
total = -1;
|
2007-10-13 09:06:03 +05:30
|
|
|
break;
|
|
|
|
}
|
2007-10-17 15:44:11 +05:30
|
|
|
/* if count == 0, bz_write finalizes compression */
|
|
|
|
total = bz_write(strm, rbuf, count, wbuf);
|
|
|
|
if (count == 0 || total < 0)
|
|
|
|
break;
|
2007-10-13 09:06:03 +05:30
|
|
|
}
|
|
|
|
|
2010-12-30 09:13:35 +05:30
|
|
|
/* Can't be conditional on ENABLE_FEATURE_CLEAN_UP -
|
|
|
|
* we are called repeatedly
|
|
|
|
*/
|
2007-10-17 15:44:11 +05:30
|
|
|
BZ2_bzCompressEnd(strm);
|
2007-10-13 09:06:03 +05:30
|
|
|
free(iobuf);
|
2010-12-30 09:13:35 +05:30
|
|
|
|
2007-10-17 15:44:11 +05:30
|
|
|
return total;
|
2007-10-13 09:06:03 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
int bzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
2008-07-05 14:48:54 +05:30
|
|
|
int bzip2_main(int argc UNUSED_PARAM, char **argv)
|
2007-10-13 09:06:03 +05:30
|
|
|
{
|
|
|
|
unsigned opt;
|
|
|
|
|
2007-10-14 13:21:19 +05:30
|
|
|
/* standard bzip2 flags
|
|
|
|
* -d --decompress force decompression
|
|
|
|
* -z --compress force compression
|
|
|
|
* -k --keep keep (don't delete) input files
|
|
|
|
* -f --force overwrite existing output files
|
|
|
|
* -t --test test compressed file integrity
|
|
|
|
* -c --stdout output to standard out
|
|
|
|
* -q --quiet suppress noncritical error messages
|
|
|
|
* -v --verbose be verbose (a 2nd -v gives more)
|
|
|
|
* -s --small use less memory (at most 2500k)
|
|
|
|
* -1 .. -9 set block size to 100k .. 900k
|
|
|
|
* --fast alias for -1
|
|
|
|
* --best alias for -9
|
|
|
|
*/
|
|
|
|
|
2017-08-09 01:25:02 +05:30
|
|
|
opt = getopt32(argv, "^"
|
2018-02-01 13:43:14 +05:30
|
|
|
/* Must match BBUNPK_foo constants! */
|
|
|
|
BBUNPK_OPTSTR IF_FEATURE_BZIP2_DECOMPRESS("dt") "zs123456789"
|
2017-08-09 01:25:02 +05:30
|
|
|
"\0" "s2" /* -s means -2 (compatibility) */
|
|
|
|
);
|
2017-01-08 11:58:34 +05:30
|
|
|
#if ENABLE_FEATURE_BZIP2_DECOMPRESS /* bunzip2_main may not be visible... */
|
2018-02-01 13:43:14 +05:30
|
|
|
if (opt & (BBUNPK_OPT_DECOMPRESS|BBUNPK_OPT_TEST)) /* -d and/or -t */
|
2007-10-13 09:06:03 +05:30
|
|
|
return bunzip2_main(argc, argv);
|
2007-10-14 13:21:19 +05:30
|
|
|
#else
|
2018-02-01 05:30:58 +05:30
|
|
|
/* clear "decompress" and "test" bits (or bbunpack() can get confused) */
|
|
|
|
/* in !BZIP2_DECOMPRESS config, these bits are -zs and are unused */
|
2018-02-01 13:43:14 +05:30
|
|
|
option_mask32 = opt & ~(BBUNPK_OPT_DECOMPRESS|BBUNPK_OPT_TEST);
|
2007-10-13 09:06:03 +05:30
|
|
|
#endif
|
|
|
|
|
2007-10-14 13:21:19 +05:30
|
|
|
argv += optind;
|
2010-05-31 17:48:57 +05:30
|
|
|
return bbunpack(argv, compressStream, append_ext, "bz2");
|
2007-10-13 09:06:03 +05:30
|
|
|
}
|