From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Sun, 11 Oct 2009 10:16:33 +0000 (-0400)
Subject: I was wrong; I included a bug at r1488.
X-Git-Tag: v2.8.0~312
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02d4c32f6992428670ee38bb08548341df5cef96;p=thirdparty%2Flibarchive.git

I was wrong; I included a bug at r1488.
The bug is option !joliet is ignored.

SVN-Revision: 1500
---

diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
index 390f3abb7..3ab50dd06 100644
--- a/libarchive/archive_read_support_format_iso9660.c
+++ b/libarchive/archive_read_support_format_iso9660.c
@@ -662,6 +662,8 @@ archive_read_format_iso9660_read_header(struct archive_read *a,
 		char seenJoliet;
 
 		vd = &(iso9660->primary);
+		if (iso9660->option_ignore_joliet)
+			iso9660->seenJoliet = 0;
 		if (iso9660->seenJoliet &&
 			vd->sector_number > iso9660->joliet.sector_number)
 			/* This condition is unlikely; by way of caution. */