wok diff busybox/stuff/busybox-1.11.0-unlzma.u @ rev 2390

mgetty: fix chroot in post_install
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Mar 10 08:59:55 2009 +0000 (2009-03-10)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/busybox/stuff/busybox-1.11.0-unlzma.u	Tue Mar 10 08:59:55 2009 +0000
     1.3 @@ -0,0 +1,30 @@
     1.4 +--- busybox-1.11.0/archival/libunarchive/decompress_unlzma.c
     1.5 ++++ busybox-1.11.0/archival/libunarchive/decompress_unlzma.c
     1.6 +@@ -78,7 +78,7 @@
     1.7 + }
     1.8 + 
     1.9 + /* Called once  */
    1.10 +-static ALWAYS_INLINE void rc_free(rc_t * rc)
    1.11 ++static ALWAYS_INLINE void rc_free(void * rc)
    1.12 + {
    1.13 + 	if (ENABLE_FEATURE_CLEAN_UP)
    1.14 + 		free(rc);
    1.15 +@@ -491,10 +491,14 @@
    1.16 + 
    1.17 + 	if (full_write(dst_fd, buffer, buffer_pos) != (ssize_t)buffer_pos) {
    1.18 +  bad:
    1.19 +-		rc_free(rc);
    1.20 +-		return -1;
    1.21 ++		len = -1;
    1.22 ++	}
    1.23 ++	else {
    1.24 ++		USE_DESKTOP(total_written += buffer_pos;)
    1.25 ++		len = USE_DESKTOP(total_written) + 0;
    1.26 + 	}
    1.27 + 	rc_free(rc);
    1.28 +-	USE_DESKTOP(total_written += buffer_pos;)
    1.29 +-	return USE_DESKTOP(total_written) + 0;
    1.30 ++	rc_free(buffer);
    1.31 ++	rc_free(p);
    1.32 ++	return len;
    1.33 + }