diff options
| author | Werner Koch <[email protected]> | 2021-03-05 14:33:40 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2021-03-05 14:33:40 +0000 |
| commit | 8c41b8aac3efb78178fe1eaf52d8d1bbc44941a8 (patch) | |
| tree | 8e2a964084519e4ff4864643573d1d41ebec0e66 /tools/gpgconf.c | |
| parent | w32: Free memory allocated by new function w32_write_console. (diff) | |
| download | gnupg-8c41b8aac3efb78178fe1eaf52d8d1bbc44941a8.tar.gz gnupg-8c41b8aac3efb78178fe1eaf52d8d1bbc44941a8.zip | |
w32: Always use Unicode for console input and output.
* common/init.c (_init_common_subsystems) [W32]: Set the codepage to
UTF-8 for input and putput. Switch gettext to UTF-8.
* tools/gpgconf.c (main): Display the input and output codepage if
they differ.
* g10/gpg.c (utf8_strings) [W32]: Make sure this is always set.
--
With this patch the former patch to use ReadConsoleW and WriteConsoleW
in ttyio.c are kind of superfluous because the ANSI version of these
functions are also able to read/write UTF-8 directly given the console
code page has been set correctly. However, this seems to work only
with recent versions of Windows-10.
GnuPG-bug-id: 4365
Diffstat (limited to 'tools/gpgconf.c')
| -rw-r--r-- | tools/gpgconf.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/gpgconf.c b/tools/gpgconf.c index 13170e452..63c305483 100644 --- a/tools/gpgconf.c +++ b/tools/gpgconf.c @@ -945,7 +945,11 @@ main (int argc, char **argv) #ifdef HAVE_W32_SYSTEM { get_outfp (&outfp); - es_fprintf (outfp, "Console: CP%u\n", GetConsoleOutputCP ()); + if (GetConsoleCP () != GetConsoleOutputCP ()) + es_fprintf (outfp, "Console: CP%u/CP%u\n", + GetConsoleCP (), GetConsoleOutputCP ()); + else + es_fprintf (outfp, "Console: CP%u\n", GetConsoleCP ()); es_fprintf (outfp, "ANSI: CP%u\n", GetACP ()); es_fprintf (outfp, "OEM: CP%u\n", GetOEMCP ()); } |