wok-6.x rev 756

busybox: do not break prefix
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed May 07 21:18:17 2008 +0000 (2008-05-07)
parents fab97211d72f
children 3a18f89210ce
files busybox/receipt busybox/stuff/busybox-1.10.1-header_tar.u
line diff
     1.1 --- a/busybox/receipt	Wed May 07 01:14:00 2008 +0200
     1.2 +++ b/busybox/receipt	Wed May 07 21:18:17 2008 +0000
     1.3 @@ -28,6 +28,7 @@
     1.4  $PACKAGE-$VERSION-tftp.u
     1.5  $PACKAGE-$VERSION-tar.u
     1.6  $PACKAGE-$VERSION-script.u
     1.7 +$PACKAGE-$VERSION-header_tar.u
     1.8  EOT
     1.9      cp ../stuff/$PACKAGE-$VERSION.config .config
    1.10      make oldconfig
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/busybox/stuff/busybox-1.10.1-header_tar.u	Wed May 07 21:18:17 2008 +0000
     2.3 @@ -0,0 +1,24 @@
     2.4 +--- busybox-1.10.1/archival/libunarchive/get_header_tar.c
     2.5 ++++ busybox-1.10.1/archival/libunarchive/get_header_tar.c
     2.6 +@@ -24,18 +24,20 @@
     2.7 + };
     2.8 + #endif
     2.9 + 
    2.10 +-/* NB: _DESTROYS_ str[len] character! */
    2.11 + static unsigned long long getOctal(char *str, int len)
    2.12 + {
    2.13 + 	unsigned long long v;
    2.14 ++	char last;
    2.15 + 	/* Actually, tar header allows leading spaces also.
    2.16 + 	 * Oh well, we will be liberal and skip this...
    2.17 + 	 * The only downside probably is that we allow "-123" too :)
    2.18 + 	if (*str < '0' || *str > '7')
    2.19 + 		bb_error_msg_and_die("corrupted octal value in tar header");
    2.20 + 	*/
    2.21 ++	last = str[len];
    2.22 + 	str[len] = '\0';
    2.23 + 	v = strtoull(str, &str, 8);
    2.24 ++	str[len] = last;
    2.25 + 	if (*str && (!ENABLE_FEATURE_TAR_OLDGNU_COMPATIBILITY || *str != ' '))
    2.26 + 		bb_error_msg_and_die("corrupted octal value in tar header");
    2.27 + 	return v;