Introduce archive_write_add_fitler()

- a convenience function to set the filter based on the code.

diff --git a/Makefile.am b/Makefile.am
index 2a58bae6c56f387d1930f92513017fc647c9cdc3..b6e85b3bdd3643a88b597e49246c943de8c7d196 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -169,6 +169,7 @@ libarchive_la_SOURCES=                                              \
        libarchive/archive_write_open_filename.c                \
        libarchive/archive_write_open_memory.c                  \
        libarchive/archive_write_private.h                      \
+       libarchive/archive_write_add_filter.c                   \
        libarchive/archive_write_add_filter_bzip2.c     \
        libarchive/archive_write_add_filter_compress.c  \
        libarchive/archive_write_add_filter_gzip.c              \

diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt
index a506908ee4b846fa42f670ef28834e733fa0c105..73d9baf01e877319f07123933a0d229616ff669b 100644 (file)
--- a/libarchive/CMakeLists.txt
+++ b/libarchive/CMakeLists.txt
@@ -93,6 +93,7 @@ SET(libarchive_SOURCES
   archive_write_open_file.c
   archive_write_open_filename.c
   archive_write_open_memory.c
+  archive_write_add_filter.c
   archive_write_add_filter_bzip2.c
   archive_write_add_filter_compress.c
   archive_write_add_filter_gzip.c

diff --git a/libarchive/archive.h b/libarchive/archive.h
index bf2875f0d6fc8813ca3ba3a4b9b87b21f87ebd31..e28037b62adb9e412f39e149281f8bbc6b97cd0a 100644 (file)
--- a/libarchive/archive.h
+++ b/libarchive/archive.h
@@ -558,6 +558,8 @@ __LA_DECL int archive_write_set_compression_program(struct archive *,
 __LA_DECL int archive_write_set_compression_xz(struct archive *);
 #endif
 
+/* A convenience function to set the filter based on the code. */
+__LA_DECL int archive_write_add_filter(struct archive *, int filter_code);
 __LA_DECL int archive_write_add_filter_bzip2(struct archive *);
 __LA_DECL int archive_write_add_filter_compress(struct archive *);
 __LA_DECL int archive_write_add_filter_gzip(struct archive *);

diff --git a/libarchive/archive_write_add_filter.c b/libarchive/archive_write_add_filter.c
new file mode 100644 (file)
index 0000000..915290a
--- /dev/null
+++ b/libarchive/archive_write_add_filter.c
@@ -0,0 +1,66 @@
+/*-
+ * Copyright (c) 2012 Ondrej Holy
+ * 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$");
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
+#include "archive.h"
+#include "archive_private.h"
+
+/* A table that maps filter codes to functions. */
+static
+struct { int code; int (*setter)(struct archive *); } codes[] =
+{
+       { ARCHIVE_FILTER_NONE,          archive_write_add_filter_none },
+       { ARCHIVE_FILTER_GZIP,          archive_write_add_filter_gzip },
+       { ARCHIVE_FILTER_BZIP2,         archive_write_add_filter_bzip2 },
+       { ARCHIVE_FILTER_COMPRESS,      archive_write_add_filter_compress },
+       { ARCHIVE_FILTER_LZMA,          archive_write_add_filter_lzma },
+       { ARCHIVE_FILTER_XZ,            archive_write_add_filter_xz },
+       { ARCHIVE_FILTER_LZIP,          archive_write_add_filter_lzip },
+       { -1,                   NULL }
+};
+
+int
+archive_write_add_filter(struct archive *a, int code)
+{
+       int i;
+
+       for (i = 0; codes[i].code != -1; i++) {
+               if (code == codes[i].code)
+                       return ((codes[i].setter)(a));
+       }
+
+       archive_set_error(a, EINVAL, "No such filter");
+       return (ARCHIVE_FATAL);
+}