Author: mm
Date: Wed Dec 21 15:02:37 2011
New Revision: 228771
URL: http://svn.freebsd.org/changeset/base/228771
Log:
Partial merge of r224691 from lib/libarchive:
Add compatibility for ISO images created with unfixed makefs that
violated ECMA-119 (ISO9660): allow reserved4 to be 0x20 in PVD.
This allows tar to read FreeBSD distribution ISO images created
with makefs prior to NetBSD bin/45217 bugfix (up to 9.0-BETA1).
MFC after: 2 weeks
Modified:
head/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c
Modified:
head/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c
Wed Dec 21 14:58:44 2011 (r228770)
+++ head/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c
Wed Dec 21 15:02:37 2011 (r228771)
@@ -895,8 +895,10 @@ isPVD(struct iso9660 *iso9660, const uns
return (0);
/* Reserved field must be 0. */
+ /* FreeBSD: makefs erroneously created images with 0x20 */
for (i = 0; i < PVD_reserved4_size; ++i)
- if (h[PVD_reserved4_offset + i] != 0)
+ if (h[PVD_reserved4_offset + i] != 0 &&
+ h[PVD_reserved4_offset + i] != 32)
return (0);
/* Reserved field must be 0. */
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
