[PATCH] Implement -k (keep input files) for various (de)compressors.

Ari Sundholm ari at tuxera.com
Fri Jun 2 13:40:58 UTC 2017


This is generally useful in many contexts where the normal utilities are
not available and compressed files are being used a lot.

Bloat-o-meter:

function                                             old     new   delta
.rodata                                           158465  158527     +62
packed_usage                                       31636   31693     +57
bbunpack                                             780     804     +24
gzip_main                                            288     306     +18
lzop_main                                            101     118     +17
bzip2_main                                           138     153     +15
unxz_main                                             86      96     +10
unlzma_main                                           87      97     +10
gunzip_main                                           82      92     +10
bunzip2_main                                          71      81     +10
do_lzo_compress                                      432     434      +2
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 11/0 up/down: 235/0)            Total: 235 bytes

Signed-off-by: Ari Sundholm <ari at tuxera.com>
---
 archival/bbunzip.c   | 36 +++++++++++++++++++++++-------------
 archival/bzip2.c     | 11 +++++++----
 archival/gzip.c      | 11 +++++++----
 archival/lzop.c      | 35 +++++++++++++++++++----------------
 include/bb_archive.h |  2 +-
 5 files changed, 57 insertions(+), 38 deletions(-)

diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 0e2a261..396a80a 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -25,6 +25,7 @@ enum {
 	OPT_QUIET      = 1 << 3,
 	OPT_DECOMPRESS = 1 << 4,
 	OPT_TEST       = 1 << 5,
+	OPT_KEEP       = 1 << 6,
 	SEAMLESS_MAGIC = (1 << 31) * ENABLE_ZCAT * SEAMLESS_COMPRESSION,
 };
 
@@ -47,7 +48,7 @@ char* FAST_FUNC append_ext(char *filename, const char *expected_ext)
 int FAST_FUNC bbunpack(char **argv,
 	IF_DESKTOP(long long) int FAST_FUNC (*unpacker)(transformer_state_t *xstate),
 	char* FAST_FUNC (*make_new_name)(char *filename, const char *expected_ext),
-	const char *expected_ext
+	const char *expected_ext, bool keep_source
 )
 {
 	struct stat stat_buf;
@@ -144,6 +145,7 @@ int FAST_FUNC bbunpack(char **argv,
 
 		if (filename) {
 			char *del = new_name;
+			bool do_del = true;
 
 			if (status >= 0) {
 				unsigned new_name_len;
@@ -182,8 +184,10 @@ int FAST_FUNC bbunpack(char **argv,
 				}
 				/* Delete _source_ file */
 				del = filename;
+				do_del = !keep_source;
 			}
-			xunlink(del);
+			if (do_del)
+				xunlink(del);
  free_name:
 			if (new_name != filename)
 				free(new_name);
@@ -243,7 +247,7 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv)
 	getopt32(argv, "cf");
 	argv += optind;
 
-	return bbunpack(argv, unpack_Z_stream, make_new_name_generic, "Z");
+	return bbunpack(argv, unpack_Z_stream, make_new_name_generic, "Z", false);
 }
 #endif
 
@@ -273,11 +277,12 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv)
  * 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
@@ -372,7 +377,7 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_FEATURE_GUNZIP_LONG_OPTIONS
 	applet_long_options = gunzip_longopts;
 #endif
-	getopt32(argv, "cfvqdtn");
+	int opts = getopt32(argv, "cfvqdtkn");
 	argv += optind;
 
 	/* If called as zcat...
@@ -382,7 +387,7 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
 	if (ENABLE_ZCAT && applet_name[1] == 'c')
 		option_mask32 |= OPT_STDOUT | SEAMLESS_MAGIC;
 
-	return bbunpack(argv, unpack_gz_stream, make_new_name_gunzip, /*unused:*/ NULL);
+	return bbunpack(argv, unpack_gz_stream, make_new_name_gunzip, /*unused:*/ NULL, opts & OPT_KEEP);
 }
 #endif /* FEATURE_GZIP_DECOMPRESS */
 
@@ -394,11 +399,12 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
  * 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"
@@ -432,12 +438,12 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
 int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 {
-	getopt32(argv, "cfvqdt");
+	int opts = getopt32(argv, "cfvqdtk");
 	argv += optind;
 	if (ENABLE_BZCAT && applet_name[2] == 'c') /* bzcat */
 		option_mask32 |= OPT_STDOUT;
 
-	return bbunpack(argv, unpack_bz2_stream, make_new_name_generic, "bz2");
+	return bbunpack(argv, unpack_bz2_stream, make_new_name_generic, "bz2", opts & OPT_KEEP);
 }
 #endif
 
@@ -456,6 +462,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 //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]..."
@@ -464,6 +471,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 //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]..."
@@ -520,7 +528,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 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");
+	int opts = getopt32(argv, "cfvqdtk");
 # if ENABLE_LZMA
 	/* lzma without -d or -t? */
 	if (applet_name[2] == 'm' && !(opts & (OPT_DECOMPRESS|OPT_TEST)))
@@ -531,7 +539,7 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv)
 		option_mask32 |= OPT_STDOUT;
 
 	argv += optind;
-	return bbunpack(argv, unpack_lzma_stream, make_new_name_generic, "lzma");
+	return bbunpack(argv, unpack_lzma_stream, make_new_name_generic, "lzma", opts & OPT_KEEP);
 }
 #endif
 
@@ -542,6 +550,7 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv)
 //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 [-cf] [FILE]..."
@@ -550,6 +559,7 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv)
 //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]..."
@@ -586,7 +596,7 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv)
 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");
+	int opts = getopt32(argv, "cfvqdtk");
 # if ENABLE_XZ
 	/* xz without -d or -t? */
 	if (applet_name[2] == '\0' && !(opts & (OPT_DECOMPRESS|OPT_TEST)))
@@ -597,6 +607,6 @@ int unxz_main(int argc UNUSED_PARAM, char **argv)
 		option_mask32 |= OPT_STDOUT;
 
 	argv += optind;
-	return bbunpack(argv, unpack_xz_stream, make_new_name_generic, "xz");
+	return bbunpack(argv, unpack_xz_stream, make_new_name_generic, "xz", opts & OPT_KEEP);
 }
 #endif
diff --git a/archival/bzip2.c b/archival/bzip2.c
index 7e38e78..59174d4 100644
--- a/archival/bzip2.c
+++ b/archival/bzip2.c
@@ -41,6 +41,7 @@
 //usage:     "\n	-d	Decompress"
 //usage:     "\n	-t	Test file integrity"
 //usage:	)
+//usage:     "\n	-k	Keep input files"
 //usage:     "\n	-c	Write to stdout"
 //usage:     "\n	-f	Force"
 
@@ -178,6 +179,7 @@ int bzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int bzip2_main(int argc UNUSED_PARAM, char **argv)
 {
 	unsigned opt;
+	bool keep_source = false;
 
 	/* standard bzip2 flags
 	 * -d --decompress force decompression
@@ -196,13 +198,14 @@ int bzip2_main(int argc UNUSED_PARAM, char **argv)
 
 	opt_complementary = "s2"; /* -s means -2 (compatibility) */
 	/* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */
-	opt = getopt32(argv, "cfv" IF_FEATURE_BZIP2_DECOMPRESS("dt") "123456789qzs");
+	opt = getopt32(argv, "cfv" IF_FEATURE_BZIP2_DECOMPRESS("dt") "k123456789qzs");
+	keep_source = opt & (ENABLE_FEATURE_BZIP2_DECOMPRESS ? 0x20 : 0x08);
 #if ENABLE_FEATURE_BZIP2_DECOMPRESS /* bunzip2_main may not be visible... */
 	if (opt & 0x18) // -d and/or -t
 		return bunzip2_main(argc, argv);
-	opt >>= 5;
+	opt >>= 6;
 #else
-	opt >>= 3;
+	opt >>= 4;
 #endif
 	opt = (uint8_t)opt; /* isolate bits for -1..-8 */
 	opt |= 0x100; /* if nothing else, assume -9 */
@@ -214,5 +217,5 @@ int bzip2_main(int argc UNUSED_PARAM, char **argv)
 
 	argv += optind;
 	option_mask32 &= 0x7; /* ignore all except -cfv */
-	return bbunpack(argv, compressStream, append_ext, "bz2");
+	return bbunpack(argv, compressStream, append_ext, "bz2", keep_source);
 }
diff --git a/archival/gzip.c b/archival/gzip.c
index e698c26..bfd838c 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -84,7 +84,7 @@ aa:      85.1% -- replaced with aa.gz
 //kbuild:lib-$(CONFIG_GZIP) += gzip.o
 
 //usage:#define gzip_trivial_usage
-//usage:       "[-cf" IF_FEATURE_GZIP_DECOMPRESS("dt") IF_FEATURE_GZIP_LEVELS("123456789") "] [FILE]..."
+//usage:       "[-cfk" IF_FEATURE_GZIP_DECOMPRESS("dt") IF_FEATURE_GZIP_LEVELS("123456789") "] [FILE]..."
 //usage:#define gzip_full_usage "\n\n"
 //usage:       "Compress FILEs (or stdin)\n"
 //usage:	IF_FEATURE_GZIP_LEVELS(
@@ -94,6 +94,7 @@ aa:      85.1% -- replaced with aa.gz
 //usage:     "\n	-d	Decompress"
 //usage:     "\n	-t	Test file integrity"
 //usage:	)
+//usage:     "\n	-k	Keep input files"
 //usage:     "\n	-c	Write to stdout"
 //usage:     "\n	-f	Force"
 //usage:
@@ -2196,6 +2197,7 @@ int gzip_main(int argc UNUSED_PARAM, char **argv)
 #endif
 {
 	unsigned opt;
+	bool keep_source = false;
 #ifdef ENABLE_FEATURE_GZIP_LEVELS
 	static const struct {
 		uint8_t good;
@@ -2219,13 +2221,14 @@ int gzip_main(int argc UNUSED_PARAM, char **argv)
 	applet_long_options = gzip_longopts;
 #endif
 	/* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */
-	opt = getopt32(argv, "cfv" IF_FEATURE_GZIP_DECOMPRESS("dt") "qn123456789");
+	opt = getopt32(argv, "cfv" IF_FEATURE_GZIP_DECOMPRESS("dt") "qnk123456789");
 #if ENABLE_FEATURE_GZIP_DECOMPRESS /* gunzip_main may not be visible... */
 	if (opt & 0x18) // -d and/or -t
 		return gunzip_main(argc, argv);
 #endif
+	keep_source = opt & (ENABLE_FEATURE_GZIP_DECOMPRESS ? 0x80 : 0x20);
 #ifdef ENABLE_FEATURE_GZIP_LEVELS
-	opt >>= ENABLE_FEATURE_GZIP_DECOMPRESS ? 7 : 5; /* drop cfv[dt]qn bits */
+	opt >>= ENABLE_FEATURE_GZIP_DECOMPRESS ? 8 : 6; /* drop cfv[dt]qnk bits */
 	if (opt == 0)
 		opt = 1 << 6; /* default: 6 */
 	opt = ffs(opt >> 4); /* Maps -1..-4 to [0], -5 to [1] ... -9 to [5] */
@@ -2247,5 +2250,5 @@ int gzip_main(int argc UNUSED_PARAM, char **argv)
 	global_crc32_table = crc32_filltable(NULL, 0);
 
 	argv += optind;
-	return bbunpack(argv, pack_gzip, append_ext, "gz");
+	return bbunpack(argv, pack_gzip, append_ext, "gz", keep_source);
 }
diff --git a/archival/lzop.c b/archival/lzop.c
index ca61add..837b3c7 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -61,11 +61,12 @@
 //kbuild:lib-$(CONFIG_LZOPCAT) += lzop.o
 
 //usage:#define lzop_trivial_usage
-//usage:       "[-cfvd123456789CF] [FILE]..."
+//usage:       "[-cfvdk123456789CF] [FILE]..."
 //usage:#define lzop_full_usage "\n\n"
 //usage:       "	-1..9	Compression level"
 //usage:     "\n	-d	Decompress"
 //usage:     "\n	-c	Write to stdout"
+//usage:     "\n	-k	Keep input files"
 //usage:     "\n	-f	Force"
 //usage:     "\n	-v	Verbose"
 //usage:     "\n	-F	Don't store or verify checksum"
@@ -78,10 +79,11 @@
 //usage:     "\n	-F	Don't verify checksum"
 //usage:
 //usage:#define unlzop_trivial_usage
-//usage:       "[-cfvF] [FILE]..."
+//usage:       "[-cfkvF] [FILE]..."
 //usage:#define unlzop_full_usage "\n\n"
 //usage:       "	-c	Write to stdout"
 //usage:     "\n	-f	Force"
+//usage:     "\n	-k	Keep input files"
 //usage:     "\n	-v	Verbose"
 //usage:     "\n	-F	Don't verify checksum"
 
@@ -472,7 +474,7 @@ struct globals {
 //#define LZOP_VERSION_STRING     "1.01"
 //#define LZOP_VERSION_DATE       "Apr 27th 2003"
 
-#define OPTION_STRING "cfvqdt123456789CF"
+#define OPTION_STRING "cfvqdtk123456789CF"
 
 /* Note: must be kept in sync with archival/bbunzip.c */
 enum {
@@ -482,17 +484,18 @@ enum {
 	OPT_QUIET       = (1 << 3),
 	OPT_DECOMPRESS  = (1 << 4),
 	OPT_TEST        = (1 << 5),
-	OPT_1           = (1 << 6),
-	OPT_2           = (1 << 7),
-	OPT_3           = (1 << 8),
-	OPT_4           = (1 << 9),
-	OPT_5           = (1 << 10),
-	OPT_6           = (1 << 11),
-	OPT_789         = (7 << 12),
-	OPT_7           = (1 << 13),
-	OPT_8           = (1 << 14),
-	OPT_C           = (1 << 15),
-	OPT_F           = (1 << 16),
+	OPT_KEEP        = (1 << 6),
+	OPT_1           = (1 << 7),
+	OPT_2           = (1 << 8),
+	OPT_3           = (1 << 9),
+	OPT_4           = (1 << 10),
+	OPT_5           = (1 << 11),
+	OPT_6           = (1 << 12),
+	OPT_789         = (7 << 13),
+	OPT_7           = (1 << 14),
+	OPT_8           = (1 << 15),
+	OPT_C           = (1 << 16),
+	OPT_F           = (1 << 17),
 };
 
 /**********************************************************************/
@@ -1123,7 +1126,7 @@ static IF_DESKTOP(long long) int FAST_FUNC pack_lzop(transformer_state_t *xstate
 int lzop_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int lzop_main(int argc UNUSED_PARAM, char **argv)
 {
-	getopt32(argv, OPTION_STRING);
+	int opts = getopt32(argv, OPTION_STRING);
 	argv += optind;
 	/* lzopcat? */
 	if (ENABLE_LZOPCAT && applet_name[4] == 'c')
@@ -1133,5 +1136,5 @@ int lzop_main(int argc UNUSED_PARAM, char **argv)
 		option_mask32 |= OPT_DECOMPRESS;
 
 	global_crc32_table = crc32_filltable(NULL, 0);
-	return bbunpack(argv, pack_lzop, make_new_name_lzop, /*unused:*/ NULL);
+	return bbunpack(argv, pack_lzop, make_new_name_lzop, /*unused:*/ NULL, opts & OPT_KEEP);
 }
diff --git a/include/bb_archive.h b/include/bb_archive.h
index 2b9c5f0..4355759 100644
--- a/include/bb_archive.h
+++ b/include/bb_archive.h
@@ -246,7 +246,7 @@ char* append_ext(char *filename, const char *expected_ext) FAST_FUNC;
 int bbunpack(char **argv,
 		IF_DESKTOP(long long) int FAST_FUNC (*unpacker)(transformer_state_t *xstate),
 		char* FAST_FUNC (*make_new_name)(char *filename, const char *expected_ext),
-		const char *expected_ext
+		const char *expected_ext, bool unlink_source
 ) FAST_FUNC;
 
 void check_errors_in_children(int signo);
-- 
2.7.4



More information about the busybox mailing list