From: Vitali Lovich <vlovich+github@gmail.com>
Date: Mon, 23 Jun 2014 22:23:35 +0000 (-0700)
Subject: configurable zip compression
X-Git-Tag: v3.1.900a~164^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F84%2Fhead;p=thirdparty%2Flibarchive.git

configurable zip compression

Have zip format honor compression-level.
---

diff --git a/libarchive/archive_write_set_format_zip.c b/libarchive/archive_write_set_format_zip.c
index 332611c86..c161c738e 100644
--- a/libarchive/archive_write_set_format_zip.c
+++ b/libarchive/archive_write_set_format_zip.c
@@ -223,6 +223,23 @@ archive_write_zip_options(struct archive_write *a, const char *key,
 			ret = ARCHIVE_OK;
 		}
 		return (ret);
+	} else if (strcmp(key, "compression-level") == 0) {
+		if (val == NULL || !(val[0] >= '0' && val[0] <= '9') || val[1] != '\0') {
+			return ARCHIVE_WARN;
+		}
+
+		if (val[0] == '0') {
+			zip->requested_compression = COMPRESSION_STORE;
+			return ARCHIVE_OK;
+		}
+
+#ifdef HAVE_ZLIB_H
+		zip->requested_compression = val[0] - '0';
+		return ARCHIVE_OK;
+#else
+		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+		    "deflate compression not supported");
+#endif
 	} else if (strcmp(key, "experimental") == 0) {
 		if (val == NULL || val[0] == 0) {
 			zip->flags &= ~ ZIP_FLAG_EXPERIMENT_xl;