From: Tim Kientzle <kientzle@acm.org>
Date: Sun, 23 Feb 2014 17:17:22 +0000 (-0800)
Subject: Enable mac extensions for mac extension test
X-Git-Tag: v3.1.900a~318
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8c391720564fb0c4fcf32d61e54191f69586b81;p=thirdparty%2Flibarchive.git

Enable mac extensions for mac extension test
---

diff --git a/libarchive/archive_read_set_options.c b/libarchive/archive_read_set_options.c
index 793f8f73e..d03961e97 100644
--- a/libarchive/archive_read_set_options.c
+++ b/libarchive/archive_read_set_options.c
@@ -96,9 +96,6 @@ archive_set_format_option(struct archive *_a, const char *m, const char *o,
 		if (r == ARCHIVE_FATAL)
 			return (ARCHIVE_FATAL);
 
-		if (m != NULL)
-			return (r);
-
 		if (r == ARCHIVE_OK)
 			rv = ARCHIVE_OK;
 	}
@@ -133,9 +130,6 @@ archive_set_filter_option(struct archive *_a, const char *m, const char *o,
 		if (r == ARCHIVE_FATAL)
 			return (ARCHIVE_FATAL);
 
-		if (m != NULL)
-			return (r);
-
 		if (r == ARCHIVE_OK)
 			rv = ARCHIVE_OK;
 	}
diff --git a/libarchive/test/test_read_format_zip_mac_metadata.c b/libarchive/test/test_read_format_zip_mac_metadata.c
index c6a23a4af..3b5dae614 100644
--- a/libarchive/test/test_read_format_zip_mac_metadata.c
+++ b/libarchive/test/test_read_format_zip_mac_metadata.c
@@ -87,6 +87,7 @@ DEFINE_TEST(test_read_format_zip_mac_metadata)
 	/* Mac metadata can only be extracted with the seeking reader. */
 	assert((a = archive_read_new()) != NULL);
 	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_zip(a));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_set_option(a, "zip", "mac-ext", "1"));
 	assertEqualIntA(a, ARCHIVE_OK, read_open_memory_seek(a, p, s, 1));
 
 	if (libz_enabled) {