nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-06-30 19:12:48 -05:00
Code Issues Projects Releases Wiki Activity

Merge legacy-Windows fixes (mostly) from 'pre-0.77'.

Browse Source
This commit is contained in:
Simon Tatham
2022-03-12 18:56:06 +00:00
parent 5243a2395a 5d58931b51
commit accf9adac2
18 changed files with 607 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
unix/platform.h
View File

@ -347,7 +347,6 @@ char *make_dir_path(const char *path, mode_t mode);
/*
* Exports from unicode.c.
*/
struct unicode_data;
bool init_ucs(struct unicode_data *ucsdata, char *line_codepage,
bool utf8_override, int font_charset, int vtmode);

4
unix/unicode.c
View File

@ -31,6 +31,8 @@ int mb_to_wc(int codepage, int flags, const char *mbstr, int mblen,
memset(&state, 0, sizeof state);
while (mblen > 0) {
if (n >= wclen)
return n;
size_t i = mbrtowc(wcstr+n, mbstr, (size_t)mblen, &state);
if (i == (size_t)-1 || i == (size_t)-2)
break;
@ -44,6 +46,8 @@ int mb_to_wc(int codepage, int flags, const char *mbstr, int mblen,
int n = 0;
while (mblen > 0) {
if (n >= wclen)
return n;
wcstr[n] = 0xD800 | (mbstr[0] & 0xFF);
n++;
mbstr++;