Don't truncate files at end of tar content

stream
Dave Vasilevsky 12 years ago
parent f93d7e7845
commit 7518c32900

@ -116,9 +116,9 @@ void pixz_write(bool tar, uint32_t level) {
static void read_thread() {
debug("reader: start");
if (gTar) {
struct archive *ar = archive_read_new();
archive_read_support_compression_none(ar);
if (gTar)
archive_read_support_format_tar(ar);
archive_read_support_format_raw(ar);
archive_read_open(ar, NULL, tar_ok, tar_read, tar_ok);
@ -134,15 +134,24 @@ static void read_thread() {
die("Error reading archive entry");
}
if (archive_format(ar) == ARCHIVE_FORMAT_RAW)
if (archive_format(ar) == ARCHIVE_FORMAT_RAW) {
gTar = false;
if (gTar) {
break;
}
add_file(archive_read_header_position(ar),
archive_entry_pathname(entry));
}
}
if (archive_read_header_position(ar) == 0)
gTar = false; // probably spuriously identified as tar
archive_read_finish(ar);
}
if (!feof(gInFile)) {
const void *dummy;
while (tar_read(NULL, NULL, &dummy) != 0)
; // just keep pumping
}
fclose(gInFile);
if (gTar)
add_file(gTotalRead, NULL);

Loading…
Cancel
Save