[git commit master 1/1] decompress_bunzip2: reinstate erroneously deleted RETVAL_SHORT_WRITE

Denys Vlasenko vda.linux at googlemail.com
Mon Nov 1 00:38:54 UTC 2010


commit: http://git.busybox.net/busybox/commit/?id=8531c43b505916067d5162469307828a4eab0ab8
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 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 d30166f..0fa4fb8 100644
--- a/archival/libunarchive/decompress_bunzip2.c
+++ b/archival/libunarchive/decompress_bunzip2.c
@@ -55,7 +55,7 @@
 #define RETVAL_LAST_BLOCK               (-1)
 #define RETVAL_NOT_BZIP_DATA            (-2)
 #define RETVAL_UNEXPECTED_INPUT_EOF     (-3)
-//#define RETVAL_SHORT_WRITE              (-4)
+#define RETVAL_SHORT_WRITE              (-4)
 #define RETVAL_DATA_ERROR               (-5)
 #define RETVAL_OUT_OF_MEMORY            (-6)
 #define RETVAL_OBSOLETE_INPUT           (-7)
@@ -745,6 +745,7 @@ unpack_bz2_stream(int src_fd, int dst_fd)
 					break;
 				if (i != full_write(dst_fd, outbuf, i)) {
 					bb_error_msg("short write");
+					i = RETVAL_SHORT_WRITE;
 					goto release_mem;
 				}
 				IF_DESKTOP(total_written += i;)
-- 
1.7.1



More information about the busybox-cvs mailing list