emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

applying fix for:

Browse Source 
0000262: tar -x doesn't believe it has reached the end of archive
This commit is contained in:
Paul Fox 2005-07-20 19:24:13 +00:00
parent 6f267f022f
commit 94ff9f1010
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
archival/libunarchive/get_header_tar.c
View File

@ -62,6 +62,7 @@ extern char get_header_tar(archive_handle_t *archive_handle)
} tar; } tar;
long sum = 0; long sum = 0;
long i; long i;
static int end = 0;
/* Align header */ /* Align header */
data_align(archive_handle, 512); data_align(archive_handle, 512);
@ -74,8 +75,17 @@ extern char get_header_tar(archive_handle_t *archive_handle)
/* If there is no filename its an empty header */ /* If there is no filename its an empty header */
if (tar.formated.name[0] == 0) { if (tar.formated.name[0] == 0) {
if (end) {
/* This is the second consecutive empty header! End of archive!
* Read until the end to empty the pipe from gz or bz2
*/
while (bb_full_read(archive_handle->src_fd, tar.raw, 512) == 512);
return(EXIT_FAILURE);
}
end = 1;
return(EXIT_SUCCESS); return(EXIT_SUCCESS);
} }
end = 0;
/* Check header has valid magic, "ustar" is for the proper tar /* Check header has valid magic, "ustar" is for the proper tar
* 0's are for the old tar format * 0's are for the old tar format