diff options
Diffstat (limited to 'archival/bbunzip.c')
-rw-r--r-- | archival/bbunzip.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/archival/bbunzip.c b/archival/bbunzip.c index f7c861256..e16e6b083 100644 --- a/archival/bbunzip.c +++ b/archival/bbunzip.c | |||
@@ -9,12 +9,12 @@ | |||
9 | #include "unarchive.h" | 9 | #include "unarchive.h" |
10 | 10 | ||
11 | enum { | 11 | enum { |
12 | OPT_STDOUT = 1, | 12 | OPT_STDOUT = 0x1, |
13 | OPT_FORCE = 2, | 13 | OPT_FORCE = 0x2, |
14 | /* gunzip only: */ | 14 | /* gunzip only: */ |
15 | OPT_TEST = 4, | 15 | OPT_VERBOSE = 0x4, |
16 | OPT_DECOMPRESS = 8, | 16 | OPT_DECOMPRESS = 0x8, |
17 | OPT_VERBOSE = 0x10, | 17 | OPT_TEST = 0x10, |
18 | }; | 18 | }; |
19 | 19 | ||
20 | static | 20 | static |
@@ -33,8 +33,7 @@ int open_to_or_warn(int to_fd, const char *filename, int flags, int mode) | |||
33 | return 0; | 33 | return 0; |
34 | } | 34 | } |
35 | 35 | ||
36 | static | 36 | int bbunpack(char **argv, |
37 | int unpack(char **argv, | ||
38 | char* (*make_new_name)(char *filename), | 37 | char* (*make_new_name)(char *filename), |
39 | USE_DESKTOP(long long) int (*unpacker)(void) | 38 | USE_DESKTOP(long long) int (*unpacker)(void) |
40 | ) | 39 | ) |
@@ -173,7 +172,7 @@ int bunzip2_main(int argc, char **argv) | |||
173 | if (applet_name[2] == 'c') | 172 | if (applet_name[2] == 'c') |
174 | option_mask32 |= OPT_STDOUT; | 173 | option_mask32 |= OPT_STDOUT; |
175 | 174 | ||
176 | return unpack(argv, make_new_name_bunzip2, unpack_bunzip2); | 175 | return bbunpack(argv, make_new_name_bunzip2, unpack_bunzip2); |
177 | } | 176 | } |
178 | 177 | ||
179 | #endif | 178 | #endif |
@@ -267,13 +266,13 @@ USE_DESKTOP(long long) int unpack_gunzip(void) | |||
267 | int gunzip_main(int argc, char **argv); | 266 | int gunzip_main(int argc, char **argv); |
268 | int gunzip_main(int argc, char **argv) | 267 | int gunzip_main(int argc, char **argv) |
269 | { | 268 | { |
270 | getopt32(argc, argv, "cftdv"); | 269 | getopt32(argc, argv, "cfvdt"); |
271 | argv += optind; | 270 | argv += optind; |
272 | /* if called as zcat */ | 271 | /* if called as zcat */ |
273 | if (applet_name[1] == 'c') | 272 | if (applet_name[1] == 'c') |
274 | option_mask32 |= OPT_STDOUT; | 273 | option_mask32 |= OPT_STDOUT; |
275 | 274 | ||
276 | return unpack(argv, make_new_name_gunzip, unpack_gunzip); | 275 | return bbunpack(argv, make_new_name_gunzip, unpack_gunzip); |
277 | } | 276 | } |
278 | 277 | ||
279 | #endif | 278 | #endif |
@@ -311,7 +310,7 @@ int unlzma_main(int argc, char **argv) | |||
311 | if (applet_name[4] == 'c') | 310 | if (applet_name[4] == 'c') |
312 | option_mask32 |= OPT_STDOUT; | 311 | option_mask32 |= OPT_STDOUT; |
313 | 312 | ||
314 | return unpack(argv, make_new_name_unlzma, unpack_unlzma); | 313 | return bbunpack(argv, make_new_name_unlzma, unpack_unlzma); |
315 | } | 314 | } |
316 | 315 | ||
317 | #endif | 316 | #endif |
@@ -350,7 +349,7 @@ int uncompress_main(int argc, char **argv) | |||
350 | getopt32(argc, argv, "cf"); | 349 | getopt32(argc, argv, "cf"); |
351 | argv += optind; | 350 | argv += optind; |
352 | 351 | ||
353 | return unpack(argv, make_new_name_uncompress, unpack_uncompress); | 352 | return bbunpack(argv, make_new_name_uncompress, unpack_uncompress); |
354 | } | 353 | } |
355 | 354 | ||
356 | #endif | 355 | #endif |