From: Adrian Ebeling <devl@adrian-ebeling.de>
Date: Mon, 17 May 2021 19:11:38 +0000 (+0200)
Subject: 7zip: Use compression settings for file header
X-Git-Tag: v3.5.2~14^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3675b106a7e85ec02e1c4c01a26b4671c70b3b63;p=thirdparty%2Flibarchive.git

7zip: Use compression settings for file header
---

diff --git a/libarchive/archive_write_set_format_7zip.c b/libarchive/archive_write_set_format_7zip.c
index f3a7446a0..9a892f71b 100644
--- a/libarchive/archive_write_set_format_7zip.c
+++ b/libarchive/archive_write_set_format_7zip.c
@@ -755,6 +755,10 @@ _7z_close(struct archive_write *a)
 		 */
 #if HAVE_LZMA_H
 		header_compression = _7Z_LZMA1;
+        if(zip->opt_compression == _7Z_LZMA2 ||
+           zip->opt_compression == _7Z_COPY)
+            header_compression = zip->opt_compression;
+
 		/* If the stored file is only one, do not encode the header.
 		 * This is the same way 7z command does. */
 		if (zip->total_number_entry == 1)
@@ -762,7 +766,8 @@ _7z_close(struct archive_write *a)
 #else
 		header_compression = _7Z_COPY;
 #endif
-		r = _7z_compression_init_encoder(a, header_compression, 6);
+		r = _7z_compression_init_encoder(a, header_compression,
+                                         zip->opt_compression_level);
 		if (r < 0)
 			return (r);
 		zip->crc32flg = PRECODE_CRC32;