emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

support gzip -t and bzip2 -t

Browse Source
This commit is contained in:
Denis Vlasenko 2008-06-27 21:52:41 +00:00
parent 3dee8e2bac
commit 55da0be405
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archival/bzip2.c
View File

@ -162,11 +162,11 @@ int bzip2_main(int argc ATTRIBUTE_UNUSED, char **argv)
opt_complementary = "s2"; /* -s means -2 (compatibility) */ opt_complementary = "s2"; /* -s means -2 (compatibility) */
/* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */ /* 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 ENABLE_BUNZIP2 /* bunzip2_main may not be visible... */
if (opt & 0x8) // -d if (opt & 0x18) // -d and/or -t
return bunzip2_main(argc, argv); return bunzip2_main(argc, argv);
opt >>= 4; opt >>= 5;
#else #else
opt >>= 3; opt >>= 3;
#endif #endif

5
archival/gzip.c
View File

@ -2049,9 +2049,9 @@ int gzip_main(int argc ATTRIBUTE_UNUSED, char **argv)
unsigned opt; unsigned opt;
/* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */ /* 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 ENABLE_GUNZIP /* gunzip_main may not be visible... */
if (opt & 0x8) // -d if (opt & 0x18) // -d and/or -t
return gunzip_main(argc, argv); return gunzip_main(argc, argv);
#endif #endif
option_mask32 &= 0x7; /* ignore -q, -0..9 */ 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)) SET_PTR_TO_GLOBALS(xzalloc(sizeof(struct globals) + sizeof(struct globals2))
+ sizeof(struct globals)); + sizeof(struct globals));
barrier();
G2.l_desc.dyn_tree = G2.dyn_ltree; G2.l_desc.dyn_tree = G2.dyn_ltree;
G2.l_desc.static_tree = G2.static_ltree; G2.l_desc.static_tree = G2.static_ltree;
G2.l_desc.extra_bits = extra_lbits; G2.l_desc.extra_bits = extra_lbits;