diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-05-27 02:22:54 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-05-27 02:22:54 +0200 |
commit | ccb88a689e0f603f8d94255a7d9cb8128b6e620d (patch) | |
tree | ebd35745219fbb246b605826a147e6ec031d891e /archival/lzop.c | |
parent | c5f30c0df8f0ce5e94ca22a5100496233067708a (diff) | |
download | busybox-w32-ccb88a689e0f603f8d94255a7d9cb8128b6e620d.tar.gz busybox-w32-ccb88a689e0f603f8d94255a7d9cb8128b6e620d.tar.bz2 busybox-w32-ccb88a689e0f603f8d94255a7d9cb8128b6e620d.zip |
unlzma: add "lzma -d" alias, add -t support, rename lzmacat->lzcat
Also coalesce some common strings
text data bss dec hex filename
844110 453 6812 851375 cfdaf busybox_old
844061 453 6812 851326 cfd7e busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival/lzop.c')
-rw-r--r-- | archival/lzop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/archival/lzop.c b/archival/lzop.c index 0a15c51aa..d6cf6f4f5 100644 --- a/archival/lzop.c +++ b/archival/lzop.c | |||
@@ -738,12 +738,12 @@ static NOINLINE smallint lzo_decompress(const header_t *h) | |||
738 | bb_error_msg_and_die("this file is a split lzop file"); | 738 | bb_error_msg_and_die("this file is a split lzop file"); |
739 | 739 | ||
740 | if (dst_len > MAX_BLOCK_SIZE) | 740 | if (dst_len > MAX_BLOCK_SIZE) |
741 | bb_error_msg_and_die("lzop file corrupted"); | 741 | bb_error_msg_and_die("corrupted data"); |
742 | 742 | ||
743 | /* read compressed block size */ | 743 | /* read compressed block size */ |
744 | src_len = read32(); | 744 | src_len = read32(); |
745 | if (src_len <= 0 || src_len > dst_len) | 745 | if (src_len <= 0 || src_len > dst_len) |
746 | bb_error_msg_and_die("lzop file corrupted"); | 746 | bb_error_msg_and_die("corrupted data"); |
747 | 747 | ||
748 | if (dst_len > block_size) { | 748 | if (dst_len > block_size) { |
749 | if (b2) { | 749 | if (b2) { |
@@ -797,7 +797,7 @@ static NOINLINE smallint lzo_decompress(const header_t *h) | |||
797 | r = lzo1x_decompress_safe(b1, src_len, b2, &d, NULL); | 797 | r = lzo1x_decompress_safe(b1, src_len, b2, &d, NULL); |
798 | 798 | ||
799 | if (r != 0 /*LZO_E_OK*/ || dst_len != d) { | 799 | if (r != 0 /*LZO_E_OK*/ || dst_len != d) { |
800 | bb_error_msg_and_die("corrupted compressed data"); | 800 | bb_error_msg_and_die("corrupted data"); |
801 | } | 801 | } |
802 | dst = b2; | 802 | dst = b2; |
803 | } else { | 803 | } else { |