diff options
| author | Brad King <brad.king@kitware.com> | 2020-02-06 15:06:12 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-02-06 15:06:12 -0500 |
| commit | 3eae0aabd20de4e698175ec81c42cfe55462e1e1 (patch) | |
| tree | 8947a2c83a4cd143de870437febb588580955fe3 | |
| parent | 44b8937b7614560d9e88d25456c8394b4b209d51 (diff) | |
| parent | 16e31523ba9d4c53a38f6420b83561b4ca56cc79 (diff) | |
| download | cmake-3eae0aabd20de4e698175ec81c42cfe55462e1e1.tar.gz | |
Merge branch 'libarchive-win-codepage' into release-3.16
Merge-request: !4332
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_string.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_string.c b/Utilities/cmlibarchive/libarchive/archive_string.c index 554533ecb9..85594cc9e5 100644 --- a/Utilities/cmlibarchive/libarchive/archive_string.c +++ b/Utilities/cmlibarchive/libarchive/archive_string.c @@ -735,7 +735,8 @@ archive_string_append_from_wcs_in_codepage(struct archive_string *as, else dp = &defchar_used; count = WideCharToMultiByte(to_cp, 0, ws, wslen, - as->s + as->length, (int)as->buffer_length-1, NULL, dp); + as->s + as->length, + (int)as->buffer_length - as->length - 1, NULL, dp); if (count == 0 && GetLastError() == ERROR_INSUFFICIENT_BUFFER) { /* Expand the MBS buffer and retry. */ @@ -1512,8 +1513,10 @@ get_current_codepage(void) p = strrchr(locale, '.'); if (p == NULL) return (GetACP()); + if (strcmp(p+1, "utf8") == 0) + return CP_UTF8; cp = my_atoi(p+1); - if (cp <= 0) + if ((int)cp <= 0) return (GetACP()); return (cp); } |