diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-06-27 21:52:41 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-06-27 21:52:41 +0000 |
| commit | 55da0be405bf4246ceb644b17b91d2686a9f1399 (patch) | |
| tree | 4abe047d8dbbe365cf6d20d7def5ba512453e508 | |
| parent | 3dee8e2bac464eb66b14ac42806c8611b6fb6a19 (diff) | |
| download | busybox-55da0be405bf4246ceb644b17b91d2686a9f1399.tar.gz | |
support gzip -t and bzip2 -t
| -rw-r--r-- | archival/bzip2.c | 6 | ||||
| -rw-r--r-- | archival/gzip.c | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/archival/bzip2.c b/archival/bzip2.c index eb570c434..62df4aab8 100644 --- a/archival/bzip2.c +++ b/archival/bzip2.c @@ -162,11 +162,11 @@ int bzip2_main(int argc ATTRIBUTE_UNUSED, char **argv) 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" USE_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 diff --git a/archival/gzip.c b/archival/gzip.c index dce40ec92..5c9d6b3b2 100644 --- a/archival/gzip.c +++ b/archival/gzip.c @@ -2049,9 +2049,9 @@ int gzip_main(int argc ATTRIBUTE_UNUSED, char **argv) unsigned opt; /* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */ - opt = getopt32(argv, "cfv" USE_GUNZIP("d") "q123456789n" ); + opt = getopt32(argv, "cfv" USE_GUNZIP("dt") "q123456789n"); #if ENABLE_GUNZIP /* gunzip_main may not be visible... */ - if (opt & 0x8) // -d + if (opt & 0x18) // -d and/or -t return gunzip_main(argc, argv); #endif option_mask32 &= 0x7; /* ignore -q, -0..9 */ @@ -2062,6 +2062,7 @@ int gzip_main(int argc ATTRIBUTE_UNUSED, char **argv) SET_PTR_TO_GLOBALS(xzalloc(sizeof(struct globals) + sizeof(struct globals2)) + sizeof(struct globals)); + barrier(); G2.l_desc.dyn_tree = G2.dyn_ltree; G2.l_desc.static_tree = G2.static_ltree; G2.l_desc.extra_bits = extra_lbits; |