diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-11-24 04:37:59 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-11-24 04:37:59 +0000 |
| commit | 80297d5f0cbe8a3de497804dcbb1a89e6f9c1562 (patch) | |
| tree | f34fce2257aff722f25347bfce7e1375d7df5db6 /arch | |
| parent | 3db254c8866de390c327d759ba615693e45aff6f (diff) | |
| download | busybox-w32-1_8_2.tar.gz busybox-w32-1_8_2.tar.bz2 busybox-w32-1_8_2.zip | |
Apply all post-1.8.1 patches1_8_2
Diffstat (limited to '')
| -rw-r--r-- | archival/libunarchive/decompress_unzip.c | 1 | ||||
| -rw-r--r-- | archival/libunarchive/get_header_tar.c | 5 | ||||
| -rw-r--r-- | archival/tar.c | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c index 0572bee68..04d6f1556 100644 --- a/archival/libunarchive/decompress_unzip.c +++ b/archival/libunarchive/decompress_unzip.c | |||
| @@ -1178,6 +1178,7 @@ unpack_gz_stream(int in, int out) | |||
| 1178 | ALLOC_STATE; | 1178 | ALLOC_STATE; |
| 1179 | bytebuffer_max = 0x8000; | 1179 | bytebuffer_max = 0x8000; |
| 1180 | bytebuffer = xmalloc(bytebuffer_max); | 1180 | bytebuffer = xmalloc(bytebuffer_max); |
| 1181 | gunzip_src_fd = in; | ||
| 1181 | 1182 | ||
| 1182 | again: | 1183 | again: |
| 1183 | if (!check_header_gzip(PASS_STATE_ONLY)) { | 1184 | if (!check_header_gzip(PASS_STATE_ONLY)) { |
diff --git a/archival/libunarchive/get_header_tar.c b/archival/libunarchive/get_header_tar.c index e8ef92994..bbf088cd8 100644 --- a/archival/libunarchive/get_header_tar.c +++ b/archival/libunarchive/get_header_tar.c | |||
| @@ -59,8 +59,9 @@ char get_header_tar(archive_handle_t *archive_handle) | |||
| 59 | char chksum[8]; /* 148-155 */ | 59 | char chksum[8]; /* 148-155 */ |
| 60 | char typeflag; /* 156-156 */ | 60 | char typeflag; /* 156-156 */ |
| 61 | char linkname[100]; /* 157-256 */ | 61 | char linkname[100]; /* 157-256 */ |
| 62 | char magic[6]; /* 257-262 */ | 62 | /* POSIX: "ustar" NUL "00" */ |
| 63 | char version[2]; /* 263-264 */ | 63 | /* GNU tar: "ustar " NUL */ |
| 64 | char magic[8]; /* 257-264 */ | ||
| 64 | char uname[32]; /* 265-296 */ | 65 | char uname[32]; /* 265-296 */ |
| 65 | char gname[32]; /* 297-328 */ | 66 | char gname[32]; /* 297-328 */ |
| 66 | char devmajor[8]; /* 329-336 */ | 67 | char devmajor[8]; /* 329-336 */ |
diff --git a/archival/tar.c b/archival/tar.c index 3fe188656..aac706b96 100644 --- a/archival/tar.c +++ b/archival/tar.c | |||
| @@ -50,8 +50,9 @@ struct TarHeader { /* byte offset */ | |||
| 50 | char chksum[8]; /* 148-155 */ | 50 | char chksum[8]; /* 148-155 */ |
| 51 | char typeflag; /* 156-156 */ | 51 | char typeflag; /* 156-156 */ |
| 52 | char linkname[NAME_SIZE]; /* 157-256 */ | 52 | char linkname[NAME_SIZE]; /* 157-256 */ |
| 53 | char magic[6]; /* 257-262 */ | 53 | /* POSIX: "ustar" NUL "00" */ |
| 54 | char version[2]; /* 263-264 */ | 54 | /* GNU tar: "ustar " NUL */ |
| 55 | char magic[8]; /* 257-264 */ | ||
| 55 | char uname[32]; /* 265-296 */ | 56 | char uname[32]; /* 265-296 */ |
| 56 | char gname[32]; /* 297-328 */ | 57 | char gname[32]; /* 297-328 */ |
| 57 | char devmajor[8]; /* 329-336 */ | 58 | char devmajor[8]; /* 329-336 */ |