mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-16 10:20:30 +00:00
Uupdate code to vendor rev. 4183 (release/2.8)
Fixes vendor issue 224: "Mishandling CD9660 images with RockRidge extensions from FreeBSD makefs" References: http://code.google.com/p/libarchive/issues/detail?id=224 MFC after: 1 week
This commit is contained in:
commit
e60867e953
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=230759
@ -1778,6 +1778,19 @@ parse_file_info(struct archive_read *a, struct file_info *parent,
|
||||
free(file);
|
||||
return (NULL);
|
||||
}
|
||||
/*
|
||||
* A file size of symbolic link files in ISO images
|
||||
* made by makefs is not zero and its location is
|
||||
* the same as those of next regular file. That is
|
||||
* the same as hard like file and it causes unexpected
|
||||
* error.
|
||||
*/
|
||||
if (file->size > 0 &&
|
||||
(file->mode & AE_IFMT) == AE_IFLNK) {
|
||||
file->size = 0;
|
||||
file->number = -1;
|
||||
file->offset = -1;
|
||||
}
|
||||
} else
|
||||
/* If there isn't SUSP, disable parsing
|
||||
* rock ridge extensions. */
|
||||
|
Loading…
Reference in New Issue
Block a user