diff options
Diffstat (limited to 'archival/unzip.c')
-rw-r--r-- | archival/unzip.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/archival/unzip.c b/archival/unzip.c index 466794031..8c4cb9881 100644 --- a/archival/unzip.c +++ b/archival/unzip.c | |||
@@ -322,7 +322,7 @@ static uint32_t read_next_cdf(uint32_t cdf_offset, cdf_header_t *cdf) | |||
322 | static void die_if_bad_fnamesize(unsigned sz) | 322 | static void die_if_bad_fnamesize(unsigned sz) |
323 | { | 323 | { |
324 | if (sz > 0xfff) /* more than 4k?! no funny business please */ | 324 | if (sz > 0xfff) /* more than 4k?! no funny business please */ |
325 | bb_error_msg_and_die("bad archive"); | 325 | bb_simple_error_msg_and_die("bad archive"); |
326 | } | 326 | } |
327 | 327 | ||
328 | static void unzip_skip(off_t skip) | 328 | static void unzip_skip(off_t skip) |
@@ -359,7 +359,7 @@ static void unzip_extract_symlink(llist_t **symlink_placeholders, | |||
359 | xread(zip_fd, target, zip->fmt.ucmpsize); | 359 | xread(zip_fd, target, zip->fmt.ucmpsize); |
360 | } else { | 360 | } else { |
361 | #if 1 | 361 | #if 1 |
362 | bb_error_msg_and_die("compressed symlink is not supported"); | 362 | bb_simple_error_msg_and_die("compressed symlink is not supported"); |
363 | #else | 363 | #else |
364 | transformer_state_t xstate; | 364 | transformer_state_t xstate; |
365 | init_transformer_state(&xstate); | 365 | init_transformer_state(&xstate); |
@@ -399,10 +399,10 @@ static void unzip_extract(zip_header_t *zip, int dst_fd) | |||
399 | if (zip->fmt.method == 8) { | 399 | if (zip->fmt.method == 8) { |
400 | /* Method 8 - inflate */ | 400 | /* Method 8 - inflate */ |
401 | if (inflate_unzip(&xstate) < 0) | 401 | if (inflate_unzip(&xstate) < 0) |
402 | bb_error_msg_and_die("inflate error"); | 402 | bb_simple_error_msg_and_die("inflate error"); |
403 | /* Validate decompression - crc */ | 403 | /* Validate decompression - crc */ |
404 | if (zip->fmt.crc32 != (xstate.crc32 ^ 0xffffffffL)) { | 404 | if (zip->fmt.crc32 != (xstate.crc32 ^ 0xffffffffL)) { |
405 | bb_error_msg_and_die("crc error"); | 405 | bb_simple_error_msg_and_die("crc error"); |
406 | } | 406 | } |
407 | } | 407 | } |
408 | #if ENABLE_FEATURE_UNZIP_BZIP2 | 408 | #if ENABLE_FEATURE_UNZIP_BZIP2 |
@@ -412,7 +412,7 @@ static void unzip_extract(zip_header_t *zip, int dst_fd) | |||
412 | */ | 412 | */ |
413 | xstate.bytes_out = unpack_bz2_stream(&xstate); | 413 | xstate.bytes_out = unpack_bz2_stream(&xstate); |
414 | if (xstate.bytes_out < 0) | 414 | if (xstate.bytes_out < 0) |
415 | bb_error_msg_and_die("inflate error"); | 415 | bb_simple_error_msg_and_die("inflate error"); |
416 | } | 416 | } |
417 | #endif | 417 | #endif |
418 | #if ENABLE_FEATURE_UNZIP_LZMA | 418 | #if ENABLE_FEATURE_UNZIP_LZMA |
@@ -420,7 +420,7 @@ static void unzip_extract(zip_header_t *zip, int dst_fd) | |||
420 | /* Not tested yet */ | 420 | /* Not tested yet */ |
421 | xstate.bytes_out = unpack_lzma_stream(&xstate); | 421 | xstate.bytes_out = unpack_lzma_stream(&xstate); |
422 | if (xstate.bytes_out < 0) | 422 | if (xstate.bytes_out < 0) |
423 | bb_error_msg_and_die("inflate error"); | 423 | bb_simple_error_msg_and_die("inflate error"); |
424 | } | 424 | } |
425 | #endif | 425 | #endif |
426 | #if ENABLE_FEATURE_UNZIP_XZ | 426 | #if ENABLE_FEATURE_UNZIP_XZ |
@@ -428,7 +428,7 @@ static void unzip_extract(zip_header_t *zip, int dst_fd) | |||
428 | /* Not tested yet */ | 428 | /* Not tested yet */ |
429 | xstate.bytes_out = unpack_xz_stream(&xstate); | 429 | xstate.bytes_out = unpack_xz_stream(&xstate); |
430 | if (xstate.bytes_out < 0) | 430 | if (xstate.bytes_out < 0) |
431 | bb_error_msg_and_die("inflate error"); | 431 | bb_simple_error_msg_and_die("inflate error"); |
432 | } | 432 | } |
433 | #endif | 433 | #endif |
434 | else { | 434 | else { |
@@ -439,7 +439,7 @@ static void unzip_extract(zip_header_t *zip, int dst_fd) | |||
439 | if (zip->fmt.ucmpsize != xstate.bytes_out) { | 439 | if (zip->fmt.ucmpsize != xstate.bytes_out) { |
440 | /* Don't die. Who knows, maybe len calculation | 440 | /* Don't die. Who knows, maybe len calculation |
441 | * was botched somewhere. After all, crc matched! */ | 441 | * was botched somewhere. After all, crc matched! */ |
442 | bb_error_msg("bad length"); | 442 | bb_simple_error_msg("bad length"); |
443 | } | 443 | } |
444 | } | 444 | } |
445 | 445 | ||
@@ -447,7 +447,7 @@ static void my_fgets80(char *buf80) | |||
447 | { | 447 | { |
448 | fflush_all(); | 448 | fflush_all(); |
449 | if (!fgets(buf80, 80, stdin)) { | 449 | if (!fgets(buf80, 80, stdin)) { |
450 | bb_perror_msg_and_die("can't read standard input"); | 450 | bb_simple_perror_msg_and_die("can't read standard input"); |
451 | } | 451 | } |
452 | } | 452 | } |
453 | 453 | ||