*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-#include "libbb.h"
-#include "bb_archive.h"
+//kbuild:lib-$(CONFIG_ZCAT) += bbunzip.o
+//kbuild:lib-$(CONFIG_GUNZIP) += bbunzip.o
+//kbuild:lib-$(CONFIG_BZCAT) += bbunzip.o
+//kbuild:lib-$(CONFIG_BUNZIP2) += bbunzip.o
/* lzop_main() uses bbunpack(), need this: */
//kbuild:lib-$(CONFIG_LZOP) += bbunzip.o
//kbuild:lib-$(CONFIG_LZOPCAT) += bbunzip.o
//kbuild:lib-$(CONFIG_UNLZOP) += bbunzip.o
/* bzip2_main() too: */
-//kbuild:lib-$(CONFIG_FEATURE_BZIP2_DECOMPRESS) += bbunzip.o
+//kbuild:lib-$(CONFIG_BZIP2) += bbunzip.o
/* gzip_main() too: */
-//kbuild:lib-$(CONFIG_FEATURE_GZIP_DECOMPRESS) += bbunzip.o
-
-/* Note: must be kept in sync with archival/lzop.c */
-enum {
- OPT_STDOUT = 1 << 0,
- OPT_FORCE = 1 << 1,
- /* only some decompressors: */
- OPT_VERBOSE = 1 << 2,
- OPT_QUIET = 1 << 3,
- OPT_DECOMPRESS = 1 << 4,
- OPT_TEST = 1 << 5,
- SEAMLESS_MAGIC = (1 << 31) * ENABLE_ZCAT * SEAMLESS_COMPRESSION,
-};
+//kbuild:lib-$(CONFIG_GZIP) += bbunzip.o
+
+#include "libbb.h"
+#include "bb_archive.h"
static
int open_to_or_warn(int to_fd, const char *filename, int flags, int mode)
/* Open src */
if (filename) {
- if (!(option_mask32 & SEAMLESS_MAGIC)) {
+ if (!(option_mask32 & BBUNPK_SEAMLESS_MAGIC)) {
if (stat(filename, &stat_buf) != 0) {
err_name:
bb_simple_perror_msg(filename);
xmove_fd(fd, STDIN_FILENO);
}
} else
- if (option_mask32 & SEAMLESS_MAGIC) {
+ if (option_mask32 & BBUNPK_SEAMLESS_MAGIC) {
/* "clever zcat" on stdin */
if (setup_unzip_on_fd(STDIN_FILENO, /*fail_if_not_compressed*/ 1))
goto err;
}
/* Special cases: test, stdout */
- if (option_mask32 & (OPT_STDOUT|OPT_TEST)) {
- if (option_mask32 & OPT_TEST)
+ if (option_mask32 & (BBUNPK_OPT_STDOUT|BBUNPK_OPT_TEST)) {
+ if (option_mask32 & BBUNPK_OPT_TEST)
if (open_to_or_warn(STDOUT_FILENO, bb_dev_null, O_WRONLY, 0))
xfunc_die();
filename = NULL;
}
/* -f: overwrite existing output files */
- if (option_mask32 & OPT_FORCE) {
+ if (option_mask32 & BBUNPK_OPT_FORCE) {
unlink(new_name);
}
}
/* Check that the input is sane */
- if (!(option_mask32 & OPT_FORCE) && isatty(STDIN_FILENO)) {
+ if (!(option_mask32 & BBUNPK_OPT_FORCE) && isatty(STDIN_FILENO)) {
bb_error_msg_and_die("compressed data not read from terminal, "
"use -f to force it");
}
- if (!(option_mask32 & SEAMLESS_MAGIC)) {
+ if (!(option_mask32 & BBUNPK_SEAMLESS_MAGIC)) {
init_transformer_state(&xstate);
/*xstate.signature_skipped = 0; - already is */
/*xstate.src_fd = STDIN_FILENO; - already is */
xfunc_die();
}
- if (!(option_mask32 & OPT_STDOUT))
+ if (!(option_mask32 & BBUNPK_OPT_STDOUT))
xclose(STDOUT_FILENO); /* with error check! */
if (filename) {
}
/* Extreme bloat for gunzip compat */
/* Some users do want this info... */
- if (ENABLE_DESKTOP && (option_mask32 & OPT_VERBOSE)) {
+ if (ENABLE_DESKTOP && (option_mask32 & BBUNPK_OPT_VERBOSE)) {
unsigned percent = status
? ((uoff_t)stat_buf.st_size * 100u / (unsigned long long)status)
: 0;
}
/* Delete _source_ file */
del = filename;
+ if (option_mask32 & BBUNPK_OPT_KEEP) /* ... unless -k */
+ del = NULL;
}
- xunlink(del);
+ if (del)
+ xunlink(del);
free_name:
if (new_name != filename)
free(new_name);
}
} while (*argv && *++argv);
- if (option_mask32 & OPT_STDOUT)
+ if (option_mask32 & BBUNPK_OPT_STDOUT)
xclose(STDOUT_FILENO); /* with error check! */
return exitcode;
//usage: "\n -f Overwrite"
//config:config UNCOMPRESS
-//config: bool "uncompress"
+//config: bool "uncompress (7.1 kb)"
//config: default n # ancient
//config: help
-//config: uncompress is used to decompress archives created by compress.
-//config: Not much used anymore, replaced by gzip/gunzip.
+//config: uncompress is used to decompress archives created by compress.
+//config: Not much used anymore, replaced by gzip/gunzip.
//applet:IF_UNCOMPRESS(APPLET(uncompress, BB_DIR_BIN, BB_SUID_DROP))
//kbuild:lib-$(CONFIG_UNCOMPRESS) += bbunzip.o
int uncompress_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int uncompress_main(int argc UNUSED_PARAM, char **argv)
{
+// (N)compress 4.2.4.4:
+// -d If given, decompression is done instead
+// -c Write output on stdout, don't remove original
+// -b Parameter limits the max number of bits/code
+// -f Forces output file to be generated
+// -v Write compression statistics
+// -V Output vesion and compile options
+// -r Recursive. If a filename is a directory, descend into it and compress everything
getopt32(argv, "cf");
+
argv += optind;
return bbunpack(argv, unpack_Z_stream, make_new_name_generic, "Z");
* Ken Turkowski, Dave Mack and Peter Jannesen.
*/
//usage:#define gunzip_trivial_usage
-//usage: "[-cft] [FILE]..."
+//usage: "[-cfkt] [FILE]..."
//usage:#define gunzip_full_usage "\n\n"
//usage: "Decompress FILEs (or stdin)\n"
//usage: "\n -c Write to stdout"
//usage: "\n -f Force"
+//usage: "\n -k Keep input files"
//usage: "\n -t Test file integrity"
//usage:
//usage:#define gunzip_example_usage
//usage: "Decompress to stdout"
//config:config GUNZIP
-//config: bool "gunzip"
+//config: bool "gunzip (11 kb)"
//config: default y
//config: select FEATURE_GZIP_DECOMPRESS
//config: help
-//config: gunzip is used to decompress archives created by gzip.
-//config: You can use the `-t' option to test the integrity of
-//config: an archive, without decompressing it.
+//config: gunzip is used to decompress archives created by gzip.
+//config: You can use the '-t' option to test the integrity of
+//config: an archive, without decompressing it.
//config:
//config:config ZCAT
-//config: bool "zcat"
+//config: bool "zcat (24 kb)"
//config: default y
//config: select FEATURE_GZIP_DECOMPRESS
//config: help
-//config: Alias to "gunzip -c".
+//config: Alias to "gunzip -c".
//config:
//config:config FEATURE_GUNZIP_LONG_OPTIONS
//config: bool "Enable long options"
//config: depends on (GUNZIP || ZCAT) && LONG_OPTS
//applet:IF_GUNZIP(APPLET(gunzip, BB_DIR_BIN, BB_SUID_DROP))
+// APPLET_ODDNAME:name main location suid_type help
//applet:IF_ZCAT(APPLET_ODDNAME(zcat, gunzip, BB_DIR_BIN, BB_SUID_DROP, zcat))
#if ENABLE_FEATURE_GZIP_DECOMPRESS
static
int gunzip_main(int argc UNUSED_PARAM, char **argv)
{
#if ENABLE_FEATURE_GUNZIP_LONG_OPTIONS
- applet_long_options = gunzip_longopts;
+ getopt32long(argv, BBUNPK_OPTSTR "dtn", gunzip_longopts);
+#else
+ getopt32(argv, BBUNPK_OPTSTR "dtn");
#endif
- getopt32(argv, "cfvqdtn");
argv += optind;
/* If called as zcat...
* Normally, "zcat" is just "gunzip -c".
* But if seamless magic is enabled, then we are much more clever.
*/
- if (ENABLE_ZCAT && applet_name[1] == 'c')
- option_mask32 |= OPT_STDOUT | SEAMLESS_MAGIC;
+ if (ENABLE_ZCAT && (!ENABLE_GUNZIP || applet_name[1] == 'c'))
+ option_mask32 |= BBUNPK_OPT_STDOUT | BBUNPK_SEAMLESS_MAGIC;
return bbunpack(argv, unpack_gz_stream, make_new_name_gunzip, /*unused:*/ NULL);
}
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
//usage:#define bunzip2_trivial_usage
-//usage: "[-cf] [FILE]..."
+//usage: "[-cfk] [FILE]..."
//usage:#define bunzip2_full_usage "\n\n"
//usage: "Decompress FILEs (or stdin)\n"
//usage: "\n -c Write to stdout"
//usage: "\n -f Force"
+//usage: "\n -k Keep input files"
//usage:#define bzcat_trivial_usage
//usage: "[FILE]..."
//usage:#define bzcat_full_usage "\n\n"
//usage: "Decompress to stdout"
//config:config BUNZIP2
-//config: bool "bunzip2"
+//config: bool "bunzip2 (8.7 kb)"
//config: default y
//config: select FEATURE_BZIP2_DECOMPRESS
//config: help
-//config: bunzip2 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.
+//config: bunzip2 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.
//config:
-//config: Unless you have a specific application which requires bunzip2, you
-//config: should probably say N here.
+//config: Unless you have a specific application which requires bunzip2, you
+//config: should probably say N here.
//config:
//config:config BZCAT
-//config: bool "bzcat"
+//config: bool "bzcat (8.7 kb)"
//config: default y
//config: select FEATURE_BZIP2_DECOMPRESS
//config: help
-//config: Alias to "bunzip2 -c".
+//config: Alias to "bunzip2 -c".
//applet:IF_BUNZIP2(APPLET(bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP))
+// APPLET_ODDNAME:name main location suid_type help
//applet:IF_BZCAT(APPLET_ODDNAME(bzcat, bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP, bzcat))
-#if ENABLE_FEATURE_BZIP2_DECOMPRESS
+#if ENABLE_FEATURE_BZIP2_DECOMPRESS || ENABLE_BUNZIP2 || ENABLE_BZCAT
int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int bunzip2_main(int argc UNUSED_PARAM, char **argv)
{
- getopt32(argv, "cfvqdt");
+ getopt32(argv, BBUNPK_OPTSTR "dt");
argv += optind;
- if (ENABLE_BZCAT && applet_name[2] == 'c') /* bzcat */
- option_mask32 |= OPT_STDOUT;
+ if (ENABLE_BZCAT && (!ENABLE_BUNZIP2 || applet_name[2] == 'c')) /* bzcat */
+ option_mask32 |= BBUNPK_OPT_STDOUT;
return bbunpack(argv, unpack_bz2_stream, make_new_name_generic, "bz2");
}
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
//usage:#define unlzma_trivial_usage
-//usage: "[-cf] [FILE]..."
+//usage: "[-cfk] [FILE]..."
//usage:#define unlzma_full_usage "\n\n"
//usage: "Decompress FILE (or stdin)\n"
//usage: "\n -c Write to stdout"
//usage: "\n -f Force"
+//usage: "\n -k Keep input files"
//usage:
//usage:#define lzma_trivial_usage
-//usage: "-d [-cf] [FILE]..."
+//usage: "-d [-cfk] [FILE]..."
//usage:#define lzma_full_usage "\n\n"
//usage: "Decompress FILE (or stdin)\n"
//usage: "\n -d Decompress"
//usage: "\n -c Write to stdout"
//usage: "\n -f Force"
+//usage: "\n -k Keep input files"
//usage:
//usage:#define lzcat_trivial_usage
//usage: "[FILE]..."
//usage:#define lzcat_full_usage "\n\n"
//usage: "Decompress to stdout"
-//usage:
-//usage:#define unxz_trivial_usage
-//usage: "[-cf] [FILE]..."
-//usage:#define unxz_full_usage "\n\n"
-//usage: "Decompress FILE (or stdin)\n"
-//usage: "\n -c Write to stdout"
-//usage: "\n -f Force"
-//usage:
-//usage:#define xz_trivial_usage
-//usage: "-d [-cf] [FILE]..."
-//usage:#define xz_full_usage "\n\n"
-//usage: "Decompress FILE (or stdin)\n"
-//usage: "\n -d Decompress"
-//usage: "\n -c Write to stdout"
-//usage: "\n -f Force"
-//usage:
-//usage:#define xzcat_trivial_usage
-//usage: "[FILE]..."
-//usage:#define xzcat_full_usage "\n\n"
-//usage: "Decompress to stdout"
//config:config UNLZMA
-//config: bool "unlzma"
+//config: bool "unlzma (7.5 kb)"
//config: default y
//config: help
-//config: unlzma is a compression utility using the Lempel-Ziv-Markov chain
-//config: compression algorithm, and range coding. Compression
-//config: is generally considerably better than that achieved by the bzip2
-//config: compressors.
-//config:
-//config: The BusyBox unlzma applet is limited to decompression only.
-//config: On an x86 system, this applet adds about 4K.
+//config: unlzma is a compression utility using the Lempel-Ziv-Markov chain
+//config: compression algorithm, and range coding. Compression
+//config: is generally considerably better than that achieved by the bzip2
+//config: compressors.
//config:
//config:config LZCAT
-//config: bool "lzcat"
+//config: bool "lzcat (7.5 kb)"
//config: default y
//config: help
-//config: unlzma is a compression utility using the Lempel-Ziv-Markov chain
-//config: compression algorithm, and range coding. Compression
-//config: is generally considerably better than that achieved by the bzip2
-//config: compressors.
-//config:
-//config: The BusyBox unlzma applet is limited to decompression only.
-//config: On an x86 system, this applet adds about 4K.
+//config: Alias to "unlzma -c".
//config:
//config:config LZMA
//config: bool "lzma -d"
//config: default y
//config: help
-//config: Enable this option if you want commands like "lzma -d" to work.
-//config: IOW: you'll get lzma applet, but it will always require -d option.
-//config:
-//config:config FEATURE_LZMA_FAST
-//config: bool "Optimize for speed"
-//config: default n
-//config: depends on UNLZMA || LZCAT || LZMA
-//config: help
-//config: This option reduces decompression time by about 25% at the cost of
-//config: a 1K bigger binary.
+//config: Enable this option if you want commands like "lzma -d" to work.
+//config: IOW: you'll get lzma applet, but it will always require -d option.
//applet:IF_UNLZMA(APPLET(unlzma, BB_DIR_USR_BIN, BB_SUID_DROP))
+// APPLET_ODDNAME:name main location suid_type help
//applet:IF_LZCAT(APPLET_ODDNAME(lzcat, unlzma, BB_DIR_USR_BIN, BB_SUID_DROP, lzcat))
-//applet:IF_LZMA(APPLET_ODDNAME(lzma, unlzma, BB_DIR_USR_BIN, BB_SUID_DROP, lzma))
+//applet:IF_LZMA( APPLET_ODDNAME(lzma, unlzma, BB_DIR_USR_BIN, BB_SUID_DROP, lzma))
//kbuild:lib-$(CONFIG_UNLZMA) += bbunzip.o
//kbuild:lib-$(CONFIG_LZCAT) += bbunzip.o
//kbuild:lib-$(CONFIG_LZMA) += bbunzip.o
int unlzma_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int unlzma_main(int argc UNUSED_PARAM, char **argv)
{
- IF_LZMA(int opts =) getopt32(argv, "cfvqdt");
+ IF_LZMA(int opts =) getopt32(argv, BBUNPK_OPTSTR "dt");
# if ENABLE_LZMA
/* lzma without -d or -t? */
- if (applet_name[2] == 'm' && !(opts & (OPT_DECOMPRESS|OPT_TEST)))
+ if (applet_name[2] == 'm' && !(opts & (BBUNPK_OPT_DECOMPRESS|BBUNPK_OPT_TEST)))
bb_show_usage();
# endif
/* lzcat? */
if (ENABLE_LZCAT && applet_name[2] == 'c')
- option_mask32 |= OPT_STDOUT;
+ option_mask32 |= BBUNPK_OPT_STDOUT;
argv += optind;
return bbunpack(argv, unpack_lzma_stream, make_new_name_generic, "lzma");
#endif
+//usage:#define unxz_trivial_usage
+//usage: "[-cfk] [FILE]..."
+//usage:#define unxz_full_usage "\n\n"
+//usage: "Decompress FILE (or stdin)\n"
+//usage: "\n -c Write to stdout"
+//usage: "\n -f Force"
+//usage: "\n -k Keep input files"
+//usage:
+//usage:#define xz_trivial_usage
+//usage: "-d [-cfk] [FILE]..."
+//usage:#define xz_full_usage "\n\n"
+//usage: "Decompress FILE (or stdin)\n"
+//usage: "\n -d Decompress"
+//usage: "\n -c Write to stdout"
+//usage: "\n -f Force"
+//usage: "\n -k Keep input files"
+//usage:
+//usage:#define xzcat_trivial_usage
+//usage: "[FILE]..."
+//usage:#define xzcat_full_usage "\n\n"
+//usage: "Decompress to stdout"
+
//config:config UNXZ
-//config: bool "unxz"
+//config: bool "unxz (13 kb)"
//config: default y
//config: help
-//config: unxz is a unlzma successor.
+//config: unxz is a unlzma successor.
//config:
//config:config XZCAT
-//config: bool "xzcat"
+//config: bool "xzcat (13 kb)"
//config: default y
//config: help
-//config: Alias to "unxz -c".
+//config: Alias to "unxz -c".
//config:
//config:config XZ
//config: bool "xz -d"
//config: default y
//config: help
-//config: Enable this option if you want commands like "xz -d" to work.
-//config: IOW: you'll get xz applet, but it will always require -d option.
+//config: Enable this option if you want commands like "xz -d" to work.
+//config: IOW: you'll get xz applet, but it will always require -d option.
//applet:IF_UNXZ(APPLET(unxz, BB_DIR_USR_BIN, BB_SUID_DROP))
+// APPLET_ODDNAME:name main location suid_type help
//applet:IF_XZCAT(APPLET_ODDNAME(xzcat, unxz, BB_DIR_USR_BIN, BB_SUID_DROP, xzcat))
-//applet:IF_XZ(APPLET_ODDNAME(xz, unxz, BB_DIR_USR_BIN, BB_SUID_DROP, xz))
+//applet:IF_XZ( APPLET_ODDNAME(xz, unxz, BB_DIR_USR_BIN, BB_SUID_DROP, xz))
//kbuild:lib-$(CONFIG_UNXZ) += bbunzip.o
//kbuild:lib-$(CONFIG_XZCAT) += bbunzip.o
//kbuild:lib-$(CONFIG_XZ) += bbunzip.o
int unxz_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int unxz_main(int argc UNUSED_PARAM, char **argv)
{
- IF_XZ(int opts =) getopt32(argv, "cfvqdt");
+ IF_XZ(int opts =) getopt32(argv, BBUNPK_OPTSTR "dt");
# if ENABLE_XZ
/* xz without -d or -t? */
- if (applet_name[2] == '\0' && !(opts & (OPT_DECOMPRESS|OPT_TEST)))
+ if (applet_name[2] == '\0' && !(opts & (BBUNPK_OPT_DECOMPRESS|BBUNPK_OPT_TEST)))
bb_show_usage();
# endif
/* xzcat? */
if (ENABLE_XZCAT && applet_name[2] == 'c')
- option_mask32 |= OPT_STDOUT;
+ option_mask32 |= BBUNPK_OPT_STDOUT;
argv += optind;
return bbunpack(argv, unpack_xz_stream, make_new_name_generic, "xz");
projects / oweals / busybox.git / blobdiff