Date: Sat, 25 Jul 2009 18:11:55 +0000 (UTC) From: Tim Kientzle <kientzle@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r195873 - head/lib/libarchive Message-ID: <200907251811.n6PIBtbG047529@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kientzle Date: Sat Jul 25 18:11:55 2009 New Revision: 195873 URL: http://svn.freebsd.org/changeset/base/195873 Log: Libarchive recognizes hardlinked files on ISO images, but returned them incorrectly, causing tar to actually erase the resulting file while trying to restore the link. This one-line fix corrects the hardlink descriptions to avoid this problem. Thanks to Jung-uk Kim for pointing this out. Approved by: re (kib) Modified: head/lib/libarchive/archive_read_support_format_iso9660.c Modified: head/lib/libarchive/archive_read_support_format_iso9660.c ============================================================================== --- head/lib/libarchive/archive_read_support_format_iso9660.c Sat Jul 25 17:40:49 2009 (r195872) +++ head/lib/libarchive/archive_read_support_format_iso9660.c Sat Jul 25 18:11:55 2009 (r195873) @@ -579,6 +579,7 @@ archive_read_format_iso9660_read_header( && file->size > 0) { archive_entry_set_hardlink(entry, iso9660->previous_pathname.s); + archive_entry_unset_size(entry); iso9660->entry_bytes_remaining = 0; iso9660->entry_sparse_offset = 0; release_file(iso9660, file);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907251811.n6PIBtbG047529>