* about bzip2 library code.
*/
+//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"
+//usage: "\n -d Decompress"
+//usage: "\n -c Write to stdout"
+//usage: "\n -f Force"
+
#include "libbb.h"
+#include "bb_archive.h"
-#define CONFIG_BZIP2_FEATURE_SPEED 1
+#define CONFIG_BZIP2_FAST 1
/* Speed test:
* Compiled with gcc 4.2.1, run on Athlon 64 1800 MHz (512K L2 cache).
* (time to compress gcc-4.2.1.tar is 126.4% compared to bbox).
* At SPEED 5 difference is 32.7%.
*
- * Test run of all CONFIG_BZIP2_FEATURE_SPEED values on a 11Mb text file:
+ * Test run of all CONFIG_BZIP2_FAST values on a 11Mb text file:
* Size Time (3 runs)
* 0: 10828 4.145 4.146 4.148
* 1: 11097 3.845 3.860 3.861
/* Takes ~300 bytes, detects corruption caused by bad RAM etc */
#define BZ_LIGHT_DEBUG 0
-#include "bz/bzlib.h"
+#include "libarchive/bz/bzlib.h"
-#include "bz/bzlib_private.h"
+#include "libarchive/bz/bzlib_private.h"
-#include "bz/blocksort.c"
-#include "bz/bzlib.c"
-#include "bz/compress.c"
-#include "bz/huffman.c"
+#include "libarchive/bz/blocksort.c"
+#include "libarchive/bz/bzlib.c"
+#include "libarchive/bz/compress.c"
+#include "libarchive/bz/huffman.c"
/* No point in being shy and having very small buffer here.
* bzip2 internal buffers are much bigger anyway, hundreds of kbytes.
IOBUF_SIZE = 8 * 1024
};
+static uint8_t level;
+
+/* NB: compressStream() has to return -1 on errors, not die.
+ * bbunpack() will correctly clean up in this case
+ * (delete incomplete .bz2 file)
+ */
+
/* Returns:
- * <0 on write errors (examine errno),
- * >0 on short writes (errno == 0)
- * 0 no error (entire input consumed, gimme more)
- * on "impossible" errors (internal bzip2 compressor bug) dies
+ * -1 on errors
+ * total written bytes so far otherwise
*/
static
-ssize_t bz_write(bz_stream *strm, void* rbuf, ssize_t rlen, void *wbuf)
+IF_DESKTOP(long long) int bz_write(bz_stream *strm, void* rbuf, ssize_t rlen, void *wbuf)
{
int n, n2, ret;
strm->avail_in = rlen;
- strm->next_in = rbuf;
+ strm->next_in = rbuf;
while (1) {
strm->avail_out = IOBUF_SIZE;
strm->next_out = wbuf;
- ret = BZ2_bzCompress(strm, BZ_RUN);
- if (ret != BZ_RUN_OK)
+ 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 */
+ ) {
bb_error_msg_and_die("internal error %d", ret);
-
- n = IOBUF_SIZE - strm->avail_out;
- if (n) {
- /* short reads must have errno == 0 */
- errno = 0;
- n2 = full_write(STDOUT_FILENO, wbuf, n);
- if (n2 != n)
- return n2 ? n2 : 1;
}
- if (strm->avail_in == 0)
- return 0;
- }
-}
-
-
-/*---------------------------------------------------*/
-static
-USE_DESKTOP(long long) int bz_write_tail(bz_stream *strm, void *wbuf)
-{
- int n, n2, ret;
- USE_DESKTOP(long long) int total;
-
- total = -1;
- while (1) {
- strm->avail_out = IOBUF_SIZE;
- strm->next_out = wbuf;
-
- ret = BZ2_bzCompress(strm, BZ_FINISH);
- if (ret != BZ_FINISH_OK && ret != BZ_STREAM_END)
- bb_error_msg_and_die("internal error %d", ret);
-
n = IOBUF_SIZE - strm->avail_out;
if (n) {
n2 = full_write(STDOUT_FILENO, wbuf, n);
- if (n2 != n)
- goto err;
+ if (n2 != n) {
+ if (n2 >= 0)
+ errno = 0; /* prevent bogus error message */
+ bb_perror_msg(n2 >= 0 ? "short write" : bb_msg_write_error);
+ return -1;
+ }
}
if (ret == BZ_STREAM_END)
break;
+ if (rlen && strm->avail_in == 0)
+ break;
}
-
- total = 0 USE_DESKTOP( + strm->total_out );
- err:
- BZ2_bzCompressEnd(strm);
- return total;
+ return 0 IF_DESKTOP( + strm->total_out );
}
-static uint8_t level;
-
static
-USE_DESKTOP(long long) int compressStream(void)
+IF_DESKTOP(long long) int FAST_FUNC compressStream(transformer_aux_data_t *aux UNUSED_PARAM)
{
- USE_DESKTOP(long long) int total;
+ IF_DESKTOP(long long) int total;
ssize_t count;
bz_stream bzs; /* it's small */
#define strm (&bzs)
#define wbuf (iobuf + IOBUF_SIZE)
iobuf = xmalloc(2 * IOBUF_SIZE);
-
BZ2_bzCompressInit(strm, level);
while (1) {
count = full_read(STDIN_FILENO, rbuf, IOBUF_SIZE);
- if (count < 0)
- bb_perror_msg("read error");
- if (count <= 0)
- break;
- count = bz_write(strm, rbuf, count, wbuf);
- if (count) {
- bb_perror_msg(count < 0 ? "write error" : "short write");
+ if (count < 0) {
+ bb_perror_msg(bb_msg_read_error);
+ total = -1;
break;
}
+ /* if count == 0, bz_write finalizes compression */
+ total = bz_write(strm, rbuf, count, wbuf);
+ if (count == 0 || total < 0)
+ break;
}
- total = bz_write_tail(strm, wbuf);
+ /* Can't be conditional on ENABLE_FEATURE_CLEAN_UP -
+ * we are called repeatedly
+ */
+ BZ2_bzCompressEnd(strm);
free(iobuf);
- /* we had no error _only_ if count == 0 */
- return count == 0 ? total : -1;
-}
-static
-char* make_new_name_bzip2(char *filename)
-{
- return xasprintf("%s.bz2", filename);
+ return total;
}
int bzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int bzip2_main(int argc, char **argv)
+int bzip2_main(int argc UNUSED_PARAM, char **argv)
{
unsigned opt;
* --best alias for -9
*/
+ opt_complementary = "s2"; /* -s means -2 (compatibility) */
/* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */
- opt = getopt32(argv, "cfv" USE_BUNZIP2("d") "123456789qzs" );
+ opt = getopt32(argv, "cfv" IF_BUNZIP2("dt") "123456789qzs");
#if ENABLE_BUNZIP2 /* bunzip2_main may not be visible... */
- if (opt & 0x8) // -d
+ if (opt & 0x18) // -d and/or -t
return bunzip2_main(argc, argv);
- opt >>= 4;
+ opt >>= 5;
#else
opt >>= 3;
#endif
argv += optind;
option_mask32 &= 0x7; /* ignore all except -cfv */
- return bbunpack(argv, make_new_name_bzip2, compressStream);
+ return bbunpack(argv, compressStream, append_ext, "bz2");
}