From owner-freebsd-current@FreeBSD.ORG  Fri Jul 24 05:59:26 2009
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0061A106566C;
	Fri, 24 Jul 2009 05:59:25 +0000 (UTC)
	(envelope-from kientzle@freebsd.org)
Received: from kientzle.com (kientzle.com [66.166.149.50])
	by mx1.freebsd.org (Postfix) with ESMTP id 790088FC0A;
	Fri, 24 Jul 2009 05:59:25 +0000 (UTC)
	(envelope-from kientzle@freebsd.org)
Received: (from root@localhost)
	by kientzle.com (8.14.3/8.14.3) id n6O5xOnw036972;
	Thu, 23 Jul 2009 22:59:24 -0700 (PDT)
	(envelope-from kientzle@freebsd.org)
Received: from dark.x.kientzle.com (fw2.kientzle.com [10.123.1.2])
	by kientzle.com with SMTP id 92abxtd98xwsvdzivy4j6j25fi;
	Thu, 23 Jul 2009 22:59:24 -0700 (PDT)
	(envelope-from kientzle@freebsd.org)
Message-ID: <4A694DBB.8080800@freebsd.org>
Date: Thu, 23 Jul 2009 22:59:23 -0700
From: Tim Kientzle <kientzle@freebsd.org>
User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US;
	rv:1.8.1.21) Gecko/20090601 SeaMonkey/1.1.16
MIME-Version: 1.0
To: Jung-uk Kim <jkim@freebsd.org>
References: <4A615602.4090000@freebsd.org>
	<200907231903.46474.jkim@FreeBSD.org>
In-Reply-To: <200907231903.46474.jkim@FreeBSD.org>
Content-Type: multipart/mixed; boundary="------------040009070606010401060900"
Cc: "'freebsd-current@freebsd.org'" <freebsd-current@freebsd.org>
Subject: Re: Joliet and release ISOs?
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Jul 2009 05:59:26 -0000

This is a multi-part message in MIME format.
--------------040009070606010401060900
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Jung-uk Kim wrote:
> 
> The "--options=!joliet" trick didn't work for me:
> 
> # uname -mrs 
> FreeBSD 8.0-BETA2 amd64
> # tar -x --options=!joliet -p -f ../8.0-BETA2-amd64-livefs.iso
> # cd rescue
> # ls -il
> total 4204
> 3326283 -r-xr-xr-x  131 root  wheel  4485472  7 15 17:09 [
> 3326283 -r-xr-xr-x  131 root  wheel  4485472  7 15 17:09 atacontrol
> 3326283 -r-xr-xr-x  131 root  wheel  4485472  7 15 17:09 atmconfig
> 3326283 -r-xr-xr-x  131 root  wheel  4485472  7 15 17:09 badsect
> ...
> 3326283 -r-xr-xr-x  131 root  wheel  4485472  7 15 17:09 whoami
> 3326283 -r-xr-xr-x  131 root  wheel  4485472  7 15 17:09 zcat
> 3326283 -r-xr-xr-x  131 root  wheel  4485472  7 15 17:09 zfs
> 3326283 -r-xr-xr-x  131 root  wheel  4485472  7 15 17:09 zpool
> # file atacontrol
> atacontrol: data
> # hexdump atacontrol
> 0000000 0000 0000 0000 0000 0000 0000 0000 0000
> *
> 0447160

Try the attached patch; I believe this corrects the
reading of hardlinks from iso9660 images.

Tim

--------------040009070606010401060900
Content-Type: text/x-patch;
 name="libarchive_iso9660_hardlink.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="libarchive_iso9660_hardlink.patch"

Index: archive_read_support_format_iso9660.c
===================================================================
--- archive_read_support_format_iso9660.c	(revision 195838)
+++ archive_read_support_format_iso9660.c	(working copy)
@@ -579,6 +579,7 @@
 	    && 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);

--------------040009070606010401060900--