diff options
Diffstat (limited to 'src/tool_main.c')
-rw-r--r-- | src/tool_main.c | 57 |
1 files changed, 4 insertions, 53 deletions
diff --git a/src/tool_main.c b/src/tool_main.c index 16f513a43..1c4b07e7c 100644 --- a/src/tool_main.c +++ b/src/tool_main.c @@ -23,6 +23,10 @@ #include <sys/stat.h> +#ifdef WIN32 +#include <tchar.h> +#endif + #ifdef HAVE_SIGNAL_H #include <signal.h> #endif @@ -225,51 +229,6 @@ static void main_free(struct GlobalConfig *config) config->last = NULL; } -#ifdef WIN32 -/* TerminalSettings for Windows */ -static struct TerminalSettings { - HANDLE hStdOut; - DWORD dwOutputMode; -} TerminalSettings; - -static void configure_terminal(void) -{ - /* - * 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) - */ - - /* Define the VT flags in case we're building with an older SDK */ -#ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING - #define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004 -#endif - - memset(&TerminalSettings, 0, sizeof(TerminalSettings)); - - /* Enable VT output */ - TerminalSettings.hStdOut = GetStdHandle(STD_OUTPUT_HANDLE); - if((TerminalSettings.hStdOut != INVALID_HANDLE_VALUE) - && (GetConsoleMode(TerminalSettings.hStdOut, - &TerminalSettings.dwOutputMode))) { - SetConsoleMode(TerminalSettings.hStdOut, - TerminalSettings.dwOutputMode - | ENABLE_VIRTUAL_TERMINAL_PROCESSING); - } -} -#else -#define configure_terminal() -#endif - -static void restore_terminal(void) -{ -#ifdef WIN32 - /* Restore Console output mode and codepage to whatever they were - * when Curl started */ - SetConsoleMode(TerminalSettings.hStdOut, TerminalSettings.dwOutputMode); -#endif -} - /* ** curl tool main function. */ @@ -284,7 +243,6 @@ int main(int argc, char *argv[]) memset(&global, 0, sizeof(global)); #ifdef WIN32 -#ifdef _tcscmp /* Undocumented diagnostic option to list the full paths of all loaded modules. This is purposely pre-init. */ if(argc == 2 && !_tcscmp(argv[1], _T("--dump-module-paths"))) { @@ -294,7 +252,6 @@ int main(int argc, char *argv[]) curl_slist_free_all(head); return head ? 0 : 1; } -#endif /* _tcscmp */ /* win32_init must be called before other init routines. */ result = win32_init(); if(result) { @@ -303,9 +260,6 @@ int main(int argc, char *argv[]) } #endif - /* Perform any platform-specific terminal configuration */ - configure_terminal(); - main_checkfds(); #if defined(HAVE_SIGNAL) && defined(SIGPIPE) @@ -326,9 +280,6 @@ int main(int argc, char *argv[]) main_free(&global); } - /* Return the terminal to its original state */ - restore_terminal(); - #ifdef __NOVELL_LIBC__ if(getenv("_IN_NETWARE_BASH_") == NULL) tool_pressanykey(); |