[git commit] randomconfig fixes 4

Denys Vlasenko vda.linux at googlemail.com
Sun Jun 19 23:40:19 UTC 2016


commit: https://git.busybox.net/busybox/commit/?id=0ad872baf30b660ffb87265470d29f14cfc4b2d4
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 archival/gzip.c     | 4 +++-
 testsuite/tar.tests | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/archival/gzip.c b/archival/gzip.c
index f9bb3c7..8f1e4ff 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -77,13 +77,15 @@ aa:      85.1% -- replaced with aa.gz
 //kbuild:lib-$(CONFIG_GZIP) += gzip.o
 
 //usage:#define gzip_trivial_usage
-//usage:       "[-cfd" IF_FEATURE_GZIP_LEVELS("123456789") "] [FILE]..."
+//usage:       "[-cf" IF_GUNZIP("d") IF_FEATURE_GZIP_LEVELS("123456789") "] [FILE]..."
 //usage:#define gzip_full_usage "\n\n"
 //usage:       "Compress FILEs (or stdin)\n"
 //usage:	IF_FEATURE_GZIP_LEVELS(
 //usage:     "\n	-1..9	Compression level"
 //usage:	)
+//usage:	IF_GUNZIP(
 //usage:     "\n	-d	Decompress"
+//usage:	)
 //usage:     "\n	-c	Write to stdout"
 //usage:     "\n	-f	Force"
 //usage:
diff --git a/testsuite/tar.tests b/testsuite/tar.tests
index e902166..f19a53d 100755
--- a/testsuite/tar.tests
+++ b/testsuite/tar.tests
@@ -24,7 +24,7 @@ tar: short read
 "" ""
 SKIP=
 
-optional FEATURE_SEAMLESS_GZ
+optional FEATURE_SEAMLESS_GZ GUNZIP
 # In NOMMU case, "invalid magic" message comes from gunzip child process.
 # Otherwise, it comes from tar.
 # Need to fix output up to avoid false positive.


More information about the busybox-cvs mailing list