system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-21 07:45:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tune the bidding for tar archives. This

Browse source 
improves the recognition of hardlink entries
with/without bodies (which is implemented through
a look-ahead that uses the bid function).

MFC after: 7 days
This commit is contained in:
Tim Kientzle 2004-12-22 00:49:16 +00:00
parent e69591ddc3
commit 4256fc3386
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=139156
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/libarchive/archive_read_support_format_tar.c
View file

@ -295,8 +295,14 @@ archive_read_format_tar_bid(struct archive *a)
}
/* If it's an end-of-archive mark, we can handle it. */
if ((*(const char *)h) == 0 && archive_block_is_null(h))
return (bid + 1);
if ((*(const char *)h) == 0 && archive_block_is_null(h)) {
/* If it's a known tar file, end-of-archive is definite. */
if ((a->archive_format & ARCHIVE_FORMAT_BASE_MASK) ==
ARCHIVE_FORMAT_TAR)
return (512);
/* Empty archive? */
return (1);
}
/* If it's not an end-of-archive mark, it must have a valid checksum.*/
if (!checksum(a, h))
@ -321,6 +327,7 @@ archive_read_format_tar_bid(struct archive *a)
!( header->typeflag[0] >= 'A' && header->typeflag[0] <= 'Z') &&
!( header->typeflag[0] >= 'a' && header->typeflag[0] <= 'z') )
return (0);
bid += 2; /* 6 bits of variation in an 8-bit field leaves 2 bits. */
/* Sanity check: Look at first byte of mode field. */
switch (255 & (unsigned)header->mode[0]) {