Introduce archive_read_support_filter_by_code()

Fixes #1258

diff --git a/Makefile.am b/Makefile.am
index d526daa7356b544ba5d716ca3623cefc8f4afaa8..a1a77dfe0d2580bb080ac8c0be52e9527aa45729 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -158,6 +158,7 @@ libarchive_la_SOURCES= \
        libarchive/archive_read_set_options.c \
        libarchive/archive_read_support_filter_all.c \
        libarchive/archive_read_support_filter_bzip2.c \
+       libarchive/archive_read_support_filter_by_code.c \
        libarchive/archive_read_support_filter_compress.c \
        libarchive/archive_read_support_filter_grzip.c \
        libarchive/archive_read_support_filter_gzip.c \

diff --git a/libarchive/archive.h b/libarchive/archive.h
index 98d3afd5c59c42f3475d9654ff4ba860ab94f219..a3f3bfd735034ee57547ac2f931190c44a00818f 100644 (file)
--- a/libarchive/archive.h
+++ b/libarchive/archive.h
@@ -418,6 +418,7 @@ __LA_DECL int archive_read_support_compression_xz(struct archive *)
 #endif
 
 __LA_DECL int archive_read_support_filter_all(struct archive *);
+__LA_DECL int archive_read_support_filter_by_code(struct archive *, int);
 __LA_DECL int archive_read_support_filter_bzip2(struct archive *);
 __LA_DECL int archive_read_support_filter_compress(struct archive *);
 __LA_DECL int archive_read_support_filter_gzip(struct archive *);

diff --git a/libarchive/archive_read_filter.3 b/libarchive/archive_read_filter.3
index 1ba5fcbd6efd7d6bddf0ae45e9c871b9259701cc..4f5c3518a6ca173cd52d673ffb7042c0c9934b3f 100644 (file)
--- a/libarchive/archive_read_filter.3
+++ b/libarchive/archive_read_filter.3
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 14, 2014
+.Dd June 9, 2020
 .Dt ARCHIVE_READ_FILTER 3
 .Os
 .Sh NAME
@@ -50,6 +50,8 @@ Streaming Archive Library (libarchive, -larchive)
 .Ft int
 .Fn archive_read_support_filter_all "struct archive *"
 .Ft int
+.Fn archive_read_support_filter_by_code "struct archive *" "int"
+.Ft int
 .Fn archive_read_support_filter_bzip2 "struct archive *"
 .Ft int
 .Fn archive_read_support_filter_compress "struct archive *"
@@ -116,6 +118,14 @@ Note that
 is always enabled by default.
 .It Fn archive_read_support_filter_all
 Enables all available decompression filters.
+.It Fn archive_read_support_filter_by_code
+Enables a single filter specified by the filter code.
+This function does not work with
+.Cm ARCHIVE_FILTER_PROGRAM .
+Note: In statically-linked executables, this will cause
+your program to include support for every filter.
+If executable size is a concern, you may wish to avoid
+using this function.
 .It Fn archive_read_support_filter_program
 Data is fed through the specified external program before being dearchived.
 Note that this disables automatic detection of the compression format,

diff --git a/libarchive/archive_read_support_filter_by_code.c b/libarchive/archive_read_support_filter_by_code.c
new file mode 100644 (file)
index 0000000..94c4af6
--- /dev/null
+++ b/libarchive/archive_read_support_filter_by_code.c
@@ -0,0 +1,83 @@
+/*-
+ * Copyright (c) 2020 Martin Matuska
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "archive_platform.h"
+__FBSDID("$FreeBSD$");
+
+#include "archive.h"
+#include "archive_private.h"
+
+int
+archive_read_support_filter_by_code(struct archive *a, int filter_code)
+{
+       archive_check_magic(a, ARCHIVE_READ_MAGIC,
+           ARCHIVE_STATE_NEW, "archive_read_support_filter_by_code");
+
+       switch (filter_code) {
+       case ARCHIVE_FILTER_NONE:
+               return archive_read_support_filter_none(a);
+               break;
+       case ARCHIVE_FILTER_GZIP:
+               return archive_read_support_filter_gzip(a);
+               break;
+       case ARCHIVE_FILTER_BZIP2:
+               return archive_read_support_filter_bzip2(a);
+               break;
+       case ARCHIVE_FILTER_COMPRESS:
+               return archive_read_support_filter_compress(a);
+               break;
+       case ARCHIVE_FILTER_LZMA:
+               return archive_read_support_filter_lzma(a);
+               break;
+       case ARCHIVE_FILTER_XZ:
+               return archive_read_support_filter_xz(a);
+               break;
+       case ARCHIVE_FILTER_UU:
+               return archive_read_support_filter_uu(a);
+               break;
+       case ARCHIVE_FILTER_RPM:
+               return archive_read_support_filter_rpm(a);
+               break;
+       case ARCHIVE_FILTER_LZIP:
+               return archive_read_support_filter_lzip(a);
+               break;
+       case ARCHIVE_FILTER_LRZIP:
+               return archive_read_support_filter_lrzip(a);
+               break;
+       case ARCHIVE_FILTER_LZOP:
+               return archive_read_support_filter_lzop(a);
+               break;
+       case ARCHIVE_FILTER_GRZIP:
+               return archive_read_support_filter_grzip(a);
+               break;
+       case ARCHIVE_FILTER_LZ4:
+               return archive_read_support_filter_lz4(a);
+               break;
+       case ARCHIVE_FILTER_ZSTD:
+               return archive_read_support_filter_zstd(a);
+               break;
+       }
+       return (ARCHIVE_FATAL);
+}