mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-10 09:58:01 +00:00
5a28658a6d
Instead of maintaining a single sparse table mapping Unicode to the
currently selected code page, we now maintain a collection of such
tables mapping Unicode to any code page we've so far found a need to
work with, and we add code pages to that list as necessary, and never
throw them away (since there are a limited number of them).
This means that the wc_to_mb family of functions are effectively
stateless: they no longer depend on a 'struct unicode_data'
corresponding to the current terminal settings. So I've removed that
parameter from all of them.
This fills in the missing piece of yesterday's commit a216d86106
:
now wc_to_mb too should be able to handle internally-implemented
character sets, by hastily making their reverse mapping table if it
doesn't already have it.
(That was only a _latent_ bug, because the only use of wc_to_mb in the
cross-platform or Windows code _did_ want to convert to the currently
selected code page, so the old strategy worked in that case. But there
was no protection against an unworkable use of it being added later.)
39 lines
1.0 KiB
C
39 lines
1.0 KiB
C
/*
|
|
* dup_wc_to_mb: memory-allocating wrapper on wc_to_mb.
|
|
*
|
|
* Also dup_wc_to_mb_c: same but you already know the length of the
|
|
* string.
|
|
*/
|
|
|
|
#include <wchar.h>
|
|
|
|
#include "putty.h"
|
|
#include "misc.h"
|
|
|
|
char *dup_wc_to_mb_c(int codepage, int flags, const wchar_t *string, int len,
|
|
const char *defchr)
|
|
{
|
|
size_t outsize = len+1;
|
|
char *out = snewn(outsize, char);
|
|
|
|
while (true) {
|
|
size_t outlen = wc_to_mb(codepage, flags, string, len, out, outsize,
|
|
defchr);
|
|
/* We can only be sure we've consumed the whole input if the
|
|
* output is not within a multibyte-character-length of the
|
|
* end of the buffer! */
|
|
if (outlen < outsize && outsize - outlen > MB_LEN_MAX) {
|
|
out[outlen] = '\0';
|
|
return out;
|
|
}
|
|
|
|
sgrowarray(out, outsize, outsize);
|
|
}
|
|
}
|
|
|
|
char *dup_wc_to_mb(int codepage, int flags, const wchar_t *string,
|
|
const char *defchr)
|
|
{
|
|
return dup_wc_to_mb_c(codepage, flags, string, wcslen(string), defchr);
|
|
}
|