aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2018-08-07 08:04:15 -0500
committerRob Landley <rob@landley.net>2018-08-07 08:04:15 -0500
commite2ebdd95f0b145336a8a28994897d3596a6de910 (patch)
tree7e1de2e1cf5e2d1bf057406fa7342fe4f09ce141
parentf14a54137494f45f4870bb15599e3017534752d3 (diff)
downloadtoybox-e2ebdd95f0b145336a8a28994897d3596a6de910.tar.gz
Forgot to check in the deflate header change, and pending shouldn't default y.
-rw-r--r--lib/lib.h5
-rw-r--r--toys/pending/gzip.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/lib/lib.h b/lib/lib.h
index 61a33fa7..5cd5dc59 100644
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -314,6 +314,11 @@ char *comma_iterate(char **list, int *len);
int comma_scan(char *optlist, char *opt, int clean);
int comma_scanall(char *optlist, char *scanlist);
+// deflate.c
+
+long long gzip_fd(int infd, int outfd);
+long long gunzip_fd(int infd, int outfd);
+
// getmountlist.c
struct mtab_list {
struct mtab_list *next, *prev;
diff --git a/toys/pending/gzip.c b/toys/pending/gzip.c
index 694ef2e8..bc059dd6 100644
--- a/toys/pending/gzip.c
+++ b/toys/pending/gzip.c
@@ -13,7 +13,7 @@ USE_ZCAT(NEWTOY(zcat, "cdfk123456789[-123456789]", TOYFLAG_USR|TOYFLAG_BIN))
config GZIP
bool "gzip"
- default y
+ default n
help
usage: gzip [-19cdfk] [FILE...]
@@ -29,7 +29,7 @@ config GZIP
config GUNZIP
bool "gunzip"
- default y
+ default n
help
usage: gunzip [-cfk] [FILE...]
@@ -43,7 +43,7 @@ config GUNZIP
config ZCAT
bool "zcat"
- default y
+ default n
help
usage: zcat [FILE...]