romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 17:13:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

curl: fixed UTF-8 in current console code page (Windows)

Browse source 
Fixes #3211
Fixes #3175
Closes #3212
This commit is contained in:
Yasuhiro Matsumoto 2018-11-02 01:04:39 +09:00 • committed by Daniel Stenberg
parent 29c05ce9c3
commit 5bfaa86ceb
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
2 changed files with 31 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/tool_main.c
View file

@ -241,13 +241,12 @@ static void main_free(struct GlobalConfig *config)
static struct TerminalSettings {
HANDLE hStdOut;
DWORD dwOutputMode;
UINT nCodepage;
} TerminalSettings;
static void configure_terminal(void)
{
/*
* If we're running Windows, enable VT output & set codepage to UTF-8.
* If we're running Windows, enable VT output.
* Note: VT mode flag can be set on any version of Windows, but VT
* processing only performed on Win10 >= Creators Update)
*/
@ -257,10 +256,7 @@ static void configure_terminal(void)
#define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004
#endif
/* Cache current codepage (will restore on exit) & set codepage to UTF-8 */
memset(&TerminalSettings, 0, sizeof(TerminalSettings));
TerminalSettings.nCodepage = GetConsoleOutputCP();
SetConsoleOutputCP(65001);
/* Enable VT output */
TerminalSettings.hStdOut = GetStdHandle(STD_OUTPUT_HANDLE);
@ -282,7 +278,6 @@ static void restore_terminal(void)
/* Restore Console output mode and codepage to whatever they were
* when Curl started */
SetConsoleMode(TerminalSettings.hStdOut, TerminalSettings.dwOutputMode);
SetConsoleOutputCP(TerminalSettings.nCodepage);
#endif
}