]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
I was wrong; I included a bug at r1488.
authorMichihiro NAKAJIMA <ggcueroad@gmail.com>
Sun, 11 Oct 2009 10:16:33 +0000 (06:16 -0400)
committerMichihiro NAKAJIMA <ggcueroad@gmail.com>
Sun, 11 Oct 2009 10:16:33 +0000 (06:16 -0400)
The bug is option !joliet is ignored.

SVN-Revision: 1500

libarchive/archive_read_support_format_iso9660.c

index 390f3abb78f6f34256c954ad79fc16d116120669..3ab50dd06211edcf9f1a191633e0a4fcb7f1050f 100644 (file)
@@ -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. */