diff options
author | Paul Fox <pgf@brightstareng.com> | 2005-07-20 19:24:13 +0000 |
---|---|---|
committer | Paul Fox <pgf@brightstareng.com> | 2005-07-20 19:24:13 +0000 |
commit | 94ff9f1010e8594c4918d270f1a0bfa73df7ae79 (patch) | |
tree | 339fe9ad4c7ec7edc98e943954b993c96b6a6d91 /archival | |
parent | 6f267f022f4a1cc47b3b3607f193637262ee69e6 (diff) | |
download | busybox-w32-94ff9f1010e8594c4918d270f1a0bfa73df7ae79.tar.gz busybox-w32-94ff9f1010e8594c4918d270f1a0bfa73df7ae79.tar.bz2 busybox-w32-94ff9f1010e8594c4918d270f1a0bfa73df7ae79.zip |
applying fix for:
0000262: tar -x doesn't believe it has reached the end of archive
Diffstat (limited to 'archival')
-rw-r--r-- | archival/libunarchive/get_header_tar.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/archival/libunarchive/get_header_tar.c b/archival/libunarchive/get_header_tar.c index 1ad9ac5e5..513909d5f 100644 --- a/archival/libunarchive/get_header_tar.c +++ b/archival/libunarchive/get_header_tar.c | |||
@@ -62,6 +62,7 @@ extern char get_header_tar(archive_handle_t *archive_handle) | |||
62 | } tar; | 62 | } tar; |
63 | long sum = 0; | 63 | long sum = 0; |
64 | long i; | 64 | long i; |
65 | static int end = 0; | ||
65 | 66 | ||
66 | /* Align header */ | 67 | /* Align header */ |
67 | data_align(archive_handle, 512); | 68 | data_align(archive_handle, 512); |
@@ -74,8 +75,17 @@ extern char get_header_tar(archive_handle_t *archive_handle) | |||
74 | 75 | ||
75 | /* If there is no filename its an empty header */ | 76 | /* If there is no filename its an empty header */ |
76 | if (tar.formated.name[0] == 0) { | 77 | if (tar.formated.name[0] == 0) { |
78 | if (end) { | ||
79 | /* This is the second consecutive empty header! End of archive! | ||
80 | * Read until the end to empty the pipe from gz or bz2 | ||
81 | */ | ||
82 | while (bb_full_read(archive_handle->src_fd, tar.raw, 512) == 512); | ||
83 | return(EXIT_FAILURE); | ||
84 | } | ||
85 | end = 1; | ||
77 | return(EXIT_SUCCESS); | 86 | return(EXIT_SUCCESS); |
78 | } | 87 | } |
88 | end = 0; | ||
79 | 89 | ||
80 | /* Check header has valid magic, "ustar" is for the proper tar | 90 | /* Check header has valid magic, "ustar" is for the proper tar |
81 | * 0's are for the old tar format | 91 | * 0's are for the old tar format |