From: Tim Kientzle <kientzle@acm.org>
Date: Sun, 23 Feb 2014 17:16:34 +0000 (-0800)
Subject: Fix: process directory entries even when mac extensions are turned off
X-Git-Tag: v3.1.900a~319
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8183d06429057a59474ca8bf53ed90861138b9a1;p=thirdparty%2Flibarchive.git

Fix: process directory entries even when mac extensions are turned off
---

diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c
index 254299fae..9b5f0eecb 100644
--- a/libarchive/archive_read_support_format_zip.c
+++ b/libarchive/archive_read_support_format_zip.c
@@ -1833,7 +1833,11 @@ slurp_central_directory(struct archive_read *a, struct zip *zip)
 		 * "__MACOSX/" directory, so we should check if
 		 * it is.
 		 */
-		if (zip->process_mac_extensions) {
+		if (!zip->process_mac_extensions) {
+			/* Treat every entry as a regular entry. */
+			__archive_rb_tree_insert_node(&zip->tree,
+			    &zip_entry->node);
+		} else {
 			name = p;
 			r = rsrc_basename(name, filename_length);
 			if (filename_length >= 9 &&