diff options
Diffstat (limited to 'archival/bbunzip.c')
| -rw-r--r-- | archival/bbunzip.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/archival/bbunzip.c b/archival/bbunzip.c index 65bb8b7f4..c7962058e 100644 --- a/archival/bbunzip.c +++ b/archival/bbunzip.c | |||
| @@ -161,7 +161,7 @@ char* make_new_name_bunzip2(char *filename) | |||
| 161 | static | 161 | static |
| 162 | USE_DESKTOP(long long) int unpack_bunzip2(void) | 162 | USE_DESKTOP(long long) int unpack_bunzip2(void) |
| 163 | { | 163 | { |
| 164 | return unpack_bz2_stream(STDIN_FILENO, STDOUT_FILENO); | 164 | return unpack_bz2_stream_prime(STDIN_FILENO, STDOUT_FILENO); |
| 165 | } | 165 | } |
| 166 | 166 | ||
| 167 | int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 167 | int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
| @@ -218,8 +218,8 @@ char* make_new_name_gunzip(char *filename) | |||
| 218 | 218 | ||
| 219 | extension++; | 219 | extension++; |
| 220 | if (strcmp(extension, "tgz" + 1) == 0 | 220 | if (strcmp(extension, "tgz" + 1) == 0 |
| 221 | #if ENABLE_FEATURE_GUNZIP_UNCOMPRESS | 221 | #if ENABLE_FEATURE_SEAMLESS_Z |
| 222 | || strcmp(extension, "Z") == 0 | 222 | || (extension[0] == 'Z' && extension[1] == '\0') |
| 223 | #endif | 223 | #endif |
| 224 | ) { | 224 | ) { |
| 225 | extension[-1] = '\0'; | 225 | extension[-1] = '\0'; |
| @@ -244,8 +244,8 @@ USE_DESKTOP(long long) int unpack_gunzip(void) | |||
| 244 | unsigned char magic2; | 244 | unsigned char magic2; |
| 245 | 245 | ||
| 246 | magic2 = xread_char(STDIN_FILENO); | 246 | magic2 = xread_char(STDIN_FILENO); |
| 247 | if (ENABLE_FEATURE_GUNZIP_UNCOMPRESS && magic2 == 0x9d) { | 247 | if (ENABLE_FEATURE_SEAMLESS_Z && magic2 == 0x9d) { |
| 248 | status = uncompress(STDIN_FILENO, STDOUT_FILENO); | 248 | status = unpack_Z_stream(STDIN_FILENO, STDOUT_FILENO); |
| 249 | } else if (magic2 == 0x8b) { | 249 | } else if (magic2 == 0x8b) { |
| 250 | status = unpack_gz_stream(STDIN_FILENO, STDOUT_FILENO); | 250 | status = unpack_gz_stream(STDIN_FILENO, STDOUT_FILENO); |
| 251 | } else { | 251 | } else { |
| @@ -351,7 +351,7 @@ USE_DESKTOP(long long) int unpack_uncompress(void) | |||
| 351 | if ((xread_char(STDIN_FILENO) != 0x1f) || (xread_char(STDIN_FILENO) != 0x9d)) { | 351 | if ((xread_char(STDIN_FILENO) != 0x1f) || (xread_char(STDIN_FILENO) != 0x9d)) { |
| 352 | bb_error_msg("invalid magic"); | 352 | bb_error_msg("invalid magic"); |
| 353 | } else { | 353 | } else { |
| 354 | status = uncompress(STDIN_FILENO, STDOUT_FILENO); | 354 | status = unpack_Z_stream(STDIN_FILENO, STDOUT_FILENO); |
| 355 | } | 355 | } |
| 356 | return status; | 356 | return status; |
| 357 | } | 357 | } |