diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-11-01 01:38:54 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-11-01 01:38:54 +0100 |
| commit | 8531c43b505916067d5162469307828a4eab0ab8 (patch) | |
| tree | aa0bf80818ee5b80019ff8dd1b979b975bb059d1 /archival/libunarchive/decompress_bunzip2.c | |
| parent | 2658888c78b572f349f326dce499930fa4418b4e (diff) | |
| download | busybox-w32-8531c43b505916067d5162469307828a4eab0ab8.tar.gz busybox-w32-8531c43b505916067d5162469307828a4eab0ab8.tar.bz2 busybox-w32-8531c43b505916067d5162469307828a4eab0ab8.zip | |
decompress_bunzip2: reinstate erroneously deleted RETVAL_SHORT_WRITE
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to '')
| -rw-r--r-- | archival/libunarchive/decompress_bunzip2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/archival/libunarchive/decompress_bunzip2.c b/archival/libunarchive/decompress_bunzip2.c index d30166fa4..0fa4fb886 100644 --- a/archival/libunarchive/decompress_bunzip2.c +++ b/archival/libunarchive/decompress_bunzip2.c | |||
| @@ -55,7 +55,7 @@ | |||
| 55 | #define RETVAL_LAST_BLOCK (-1) | 55 | #define RETVAL_LAST_BLOCK (-1) |
| 56 | #define RETVAL_NOT_BZIP_DATA (-2) | 56 | #define RETVAL_NOT_BZIP_DATA (-2) |
| 57 | #define RETVAL_UNEXPECTED_INPUT_EOF (-3) | 57 | #define RETVAL_UNEXPECTED_INPUT_EOF (-3) |
| 58 | //#define RETVAL_SHORT_WRITE (-4) | 58 | #define RETVAL_SHORT_WRITE (-4) |
| 59 | #define RETVAL_DATA_ERROR (-5) | 59 | #define RETVAL_DATA_ERROR (-5) |
| 60 | #define RETVAL_OUT_OF_MEMORY (-6) | 60 | #define RETVAL_OUT_OF_MEMORY (-6) |
| 61 | #define RETVAL_OBSOLETE_INPUT (-7) | 61 | #define RETVAL_OBSOLETE_INPUT (-7) |
| @@ -745,6 +745,7 @@ unpack_bz2_stream(int src_fd, int dst_fd) | |||
| 745 | break; | 745 | break; |
| 746 | if (i != full_write(dst_fd, outbuf, i)) { | 746 | if (i != full_write(dst_fd, outbuf, i)) { |
| 747 | bb_error_msg("short write"); | 747 | bb_error_msg("short write"); |
| 748 | i = RETVAL_SHORT_WRITE; | ||
| 748 | goto release_mem; | 749 | goto release_mem; |
| 749 | } | 750 | } |
| 750 | IF_DESKTOP(total_written += i;) | 751 | IF_DESKTOP(total_written += i;) |