From: unxed <ivan.sorokin.tech@gmail.com>
Date: Tue, 22 Oct 2024 08:56:19 +0000 (+0200)
Subject: Use proper Create OS value on Windows to fix archive charset detection (#2240)
X-Git-Tag: v3.8.0~134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=755af84301adc4262722a4c88671a8d0a1c83fae;p=thirdparty%2Flibarchive.git

Use proper Create OS value on Windows to fix archive charset detection (#2240)

See https://sourceforge.net/p/sevenzip/bugs/2463
---

diff --git a/libarchive/archive_write_set_format_zip.c b/libarchive/archive_write_set_format_zip.c
index a9f287730..b4723ed13 100644
--- a/libarchive/archive_write_set_format_zip.c
+++ b/libarchive/archive_write_set_format_zip.c
@@ -520,6 +520,17 @@ archive_write_zip_header(struct archive_write *a, struct archive_entry *entry)
 	struct archive_string_conv *sconv = get_sconv(a, zip);
 	int ret, ret2 = ARCHIVE_OK;
 	mode_t type;
+#if defined(_WIN32)
+	/* On Windows use MS-DOS value as internal Windows zip archiver does
+	 * Fixes charset problems like https://sourceforge.net/p/sevenzip/bugs/2463/
+	 * Full set of possible create os values:
+	 * https://pkwaredownloads.blob.core.windows.net/pem/APPNOTE-6.3.10.txt
+	 * See "4.4.2 version made by (2 bytes)" */
+	int create_os = 0;
+#else
+	// Use UNIX value in all other cases
+	int create_os = 3;
+#endif
 	int version_needed = 10;
 #define MIN_VERSION_NEEDED(x) do { if (version_needed < x) { version_needed = x; } } while (0)
 
@@ -803,8 +814,8 @@ archive_write_zip_header(struct archive_write *a, struct archive_entry *entry)
 	++zip->central_directory_entries;
 	memset(zip->file_header, 0, 46);
 	memcpy(zip->file_header, "PK\001\002", 4);
-	/* "Made by PKZip 2.0 on Unix." */
-	archive_le16enc(zip->file_header + 4, 3 * 256 + version_needed);
+	/* "Made by PKZip 2.0 on Unix or MS-DOS." */
+	archive_le16enc(zip->file_header + 4, create_os * 256 + version_needed);
 	archive_le16enc(zip->file_header + 6, version_needed);
 	archive_le16enc(zip->file_header + 8, zip->entry_flags);
 	if (zip->entry_encryption == ENCRYPTION_WINZIP_AES128
@@ -937,7 +948,7 @@ archive_write_zip_header(struct archive_write *a, struct archive_entry *entry)
 		e += 1;
 		if (included & 1) {
 			archive_le16enc(e, /* "Version created by" */
-			    3 * 256 + version_needed);
+			    create_os * 256 + version_needed);
 			e += 2;
 		}
 		if (included & 2) {