Date: Sun, 29 Jan 2012 22:20:28 +0000 (UTC) From: Martin Matuska <mm@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r230759 - head/contrib/libarchive/libarchive Message-ID: <201201292220.q0TMKSXR055330@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mm Date: Sun Jan 29 22:20:28 2012 New Revision: 230759 URL: http://svn.freebsd.org/changeset/base/230759 Log: 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 Modified: head/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c Directory Properties: head/contrib/libarchive/ (props changed) head/contrib/libarchive/libarchive/ (props changed) Modified: head/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c ============================================================================== --- head/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c Sun Jan 29 22:12:48 2012 (r230758) +++ head/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c Sun Jan 29 22:20:28 2012 (r230759) @@ -1778,6 +1778,19 @@ parse_file_info(struct archive_read *a, 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. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201292220.q0TMKSXR055330>