diff options
Diffstat (limited to 'archival/bbunzip.c')
-rw-r--r-- | archival/bbunzip.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/archival/bbunzip.c b/archival/bbunzip.c index 75489f2a5..d25f50939 100644 --- a/archival/bbunzip.c +++ b/archival/bbunzip.c | |||
@@ -30,11 +30,11 @@ int open_to_or_warn(int to_fd, const char *filename, int flags, int mode) | |||
30 | 30 | ||
31 | int FAST_FUNC bbunpack(char **argv, | 31 | int FAST_FUNC bbunpack(char **argv, |
32 | char* (*make_new_name)(char *filename), | 32 | char* (*make_new_name)(char *filename), |
33 | USE_DESKTOP(long long) int (*unpacker)(unpack_info_t *info) | 33 | IF_DESKTOP(long long) int (*unpacker)(unpack_info_t *info) |
34 | ) | 34 | ) |
35 | { | 35 | { |
36 | struct stat stat_buf; | 36 | struct stat stat_buf; |
37 | USE_DESKTOP(long long) int status; | 37 | IF_DESKTOP(long long) int status; |
38 | char *filename, *new_name; | 38 | char *filename, *new_name; |
39 | smallint exitcode = 0; | 39 | smallint exitcode = 0; |
40 | unpack_info_t info; | 40 | unpack_info_t info; |
@@ -175,7 +175,7 @@ char* make_new_name_bunzip2(char *filename) | |||
175 | } | 175 | } |
176 | 176 | ||
177 | static | 177 | static |
178 | USE_DESKTOP(long long) int unpack_bunzip2(unpack_info_t *info UNUSED_PARAM) | 178 | IF_DESKTOP(long long) int unpack_bunzip2(unpack_info_t *info UNUSED_PARAM) |
179 | { | 179 | { |
180 | return unpack_bz2_stream_prime(STDIN_FILENO, STDOUT_FILENO); | 180 | return unpack_bz2_stream_prime(STDIN_FILENO, STDOUT_FILENO); |
181 | } | 181 | } |
@@ -251,9 +251,9 @@ char* make_new_name_gunzip(char *filename) | |||
251 | } | 251 | } |
252 | 252 | ||
253 | static | 253 | static |
254 | USE_DESKTOP(long long) int unpack_gunzip(unpack_info_t *info) | 254 | IF_DESKTOP(long long) int unpack_gunzip(unpack_info_t *info) |
255 | { | 255 | { |
256 | USE_DESKTOP(long long) int status = -1; | 256 | IF_DESKTOP(long long) int status = -1; |
257 | 257 | ||
258 | /* do the decompression, and cleanup */ | 258 | /* do the decompression, and cleanup */ |
259 | if (xread_char(STDIN_FILENO) == 0x1f) { | 259 | if (xread_char(STDIN_FILENO) == 0x1f) { |
@@ -325,7 +325,7 @@ char* make_new_name_unlzma(char *filename) | |||
325 | } | 325 | } |
326 | 326 | ||
327 | static | 327 | static |
328 | USE_DESKTOP(long long) int unpack_unlzma(unpack_info_t *info UNUSED_PARAM) | 328 | IF_DESKTOP(long long) int unpack_unlzma(unpack_info_t *info UNUSED_PARAM) |
329 | { | 329 | { |
330 | return unpack_lzma_stream(STDIN_FILENO, STDOUT_FILENO); | 330 | return unpack_lzma_stream(STDIN_FILENO, STDOUT_FILENO); |
331 | } | 331 | } |
@@ -360,9 +360,9 @@ char* make_new_name_uncompress(char *filename) | |||
360 | } | 360 | } |
361 | 361 | ||
362 | static | 362 | static |
363 | USE_DESKTOP(long long) int unpack_uncompress(unpack_info_t *info UNUSED_PARAM) | 363 | IF_DESKTOP(long long) int unpack_uncompress(unpack_info_t *info UNUSED_PARAM) |
364 | { | 364 | { |
365 | USE_DESKTOP(long long) int status = -1; | 365 | IF_DESKTOP(long long) int status = -1; |
366 | 366 | ||
367 | if ((xread_char(STDIN_FILENO) != 0x1f) || (xread_char(STDIN_FILENO) != 0x9d)) { | 367 | if ((xread_char(STDIN_FILENO) != 0x1f) || (xread_char(STDIN_FILENO) != 0x9d)) { |
368 | bb_error_msg("invalid magic"); | 368 | bb_error_msg("invalid magic"); |