d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Insert zero-padding between sparse blocks in archive_read_data(). This

Browse Source 
fixes "tar -c @foo.tar" where "foo.tar" contains sparse entries.

MFC after:	1 week
This commit is contained in:
Colin Percival 2007-01-03 13:16:59 +00:00
parent 61c0e134f5
commit dbc258608e
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/libarchive/archive_read.c
View File

@ -430,7 +430,28 @@ archive_read_data(struct archive *a, void *buff, size_t s)
archive_set_error(a, ARCHIVE_ERRNO_FILE_FORMAT,
"Encountered out-of-order sparse blocks");
return (ARCHIVE_RETRY);
} else {
}
/* Compute the amount of zero padding needed. */
if (a->read_data_output_offset + s <
a->read_data_offset) {
len = s;
} else if (a->read_data_output_offset <
a->read_data_offset) {
len = a->read_data_offset -
a->read_data_output_offset;
} else
len = 0;
/* Add zeroes. */
memset(dest, 0, len);
s -= len;
a->read_data_output_offset += len;
dest += len;
bytes_read += len;
/* Copy data if there is any space left. */
if (s > 0) {
len = a->read_data_remaining;
if (len > s)
len = s;