From owner-svn-src-all@FreeBSD.ORG  Tue Jan 13 04:56:42 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0FD84106564A;
	Tue, 13 Jan 2009 04:56:42 +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 F1B1C8FC14;
	Tue, 13 Jan 2009 04:56:41 +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 n0D4uf7E090316;
	Tue, 13 Jan 2009 04:56:41 GMT
	(envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0D4ufEC090315;
	Tue, 13 Jan 2009 04:56:41 GMT
	(envelope-from kientzle@svn.freebsd.org)
Message-Id: <200901130456.n0D4ufEC090315@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Tue, 13 Jan 2009 04:56:41 +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: r187126 - head/lib/libarchive
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jan 2009 04:56:42 -0000

Author: kientzle
Date: Tue Jan 13 04:56:41 2009
New Revision: 187126
URL: http://svn.freebsd.org/changeset/base/187126

Log:
  "The first part is just to give more info, the latter part fixes
  an error to read files past the 32bit byte offset, for instance
  on DVDs."
  
  Submitted by:	phk@
  MFC after:	10 days

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	Tue Jan 13 04:09:22 2009	(r187125)
+++ head/lib/libarchive/archive_read_support_format_iso9660.c	Tue Jan 13 04:56:41 2009	(r187126)
@@ -466,7 +466,10 @@ archive_read_format_iso9660_read_header(
 	 * seek backwards to extract it, so issue a warning. */
 	if (file->offset < iso9660->current_position) {
 		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
-		    "Ignoring out-of-order file");
+		    "Ignoring out-of-order file @%x (%s) %jd < %jd",
+		    file,
+		    iso9660->pathname.s,
+		    file->offset, iso9660->current_position);
 		iso9660->entry_bytes_remaining = 0;
 		iso9660->entry_sparse_offset = 0;
 		release_file(iso9660, file);
@@ -607,7 +610,7 @@ parse_file_info(struct iso9660 *iso9660,
 	file->parent = parent;
 	if (parent != NULL)
 		parent->refcount++;
-	file->offset = toi(isodirrec + DR_extent_offset, DR_extent_size)
+	file->offset = (uint64_t)toi(isodirrec + DR_extent_offset, DR_extent_size)
 	    * iso9660->logical_block_size;
 	file->size = toi(isodirrec + DR_size_offset, DR_size_size);
 	file->mtime = isodate7(isodirrec + DR_date_offset);