Enable mac extensions for mac extension test

diff --git a/libarchive/archive_read_set_options.c b/libarchive/archive_read_set_options.c
index 793f8f73e53edba06defac850fc8ab73c3625161..d03961e979664bcd3581b6d19f3ba04e2392373a 100644 (file)
--- 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 c6a23a4aff96e065c1d71cc8f23cd2f735cad4de..3b5dae614ce09c8ca4a350a52af9d6e49af01445 100644 (file)
--- 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) {