From owner-svn-src-head@FreeBSD.ORG  Sat Jul 25 18:11:55 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F09DD1065670;
	Sat, 25 Jul 2009 18:11:55 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DEA6D8FC24;
	Sat, 25 Jul 2009 18:11:55 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6PIBtbE047531;
	Sat, 25 Jul 2009 18:11:55 GMT
	(envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6PIBtbG047529;
	Sat, 25 Jul 2009 18:11:55 GMT
	(envelope-from kientzle@svn.freebsd.org)
Message-Id: <200907251811.n6PIBtbG047529@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Sat, 25 Jul 2009 18:11:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195873 - head/lib/libarchive
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Jul 2009 18:11:56 -0000

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);