Преглед изворни кода

Merge topic 'libarchive-windows-encoding' into release-4.0

f590010167 libarchive: Restore tolerance of archives with non-OEM paths on Windows

Acked-by: Kitware Robot <[email protected]>
Merge-request: !11622
Brad King пре 2 недеља
родитељ
комит
8b19487cbb
1 измењених фајлова са 5 додато и 0 уклоњено
  1. 5 0
      Utilities/cmlibarchive/libarchive/archive_string.c

+ 5 - 0
Utilities/cmlibarchive/libarchive/archive_string.c

@@ -552,7 +552,12 @@ archive_wstring_append_from_mbs_in_codepage(struct archive_wstring *dest,
 		} else
 			mbflag = MB_PRECOMPOSED;
 
+		/* FIXME(CMake#26903): Offer control over encoding conversion.
+		   For now, we instead tolerate invalid characters as
+		   libarchive 3.7.2 / CMake 3.30 and below did.  */
+		#if 0
 		mbflag |= MB_ERR_INVALID_CHARS;
+		#endif
 
 		buffsize = dest->length + length + 1;
 		do {