Upgrade curl to curl-7_78_0
Test: make
Change-Id: Icd602cfe251ab2fcd31320b08894b303d1a824d8
diff --git a/src/tool_main.c b/src/tool_main.c
index b604546..9f16a4e 100644
--- a/src/tool_main.c
+++ b/src/tool_main.c
@@ -5,11 +5,11 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2020, Daniel Stenberg, <[email protected]>, et al.
+ * Copyright (C) 1998 - 2021, Daniel Stenberg, <[email protected]>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
- * are also available at https://curl.haxx.se/docs/copyright.html.
+ * are also available at https://curl.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
@@ -23,6 +23,10 @@
#include <sys/stat.h>
+#ifdef WIN32
+#include <tchar.h>
+#endif
+
#ifdef HAVE_SIGNAL_H
#include <signal.h>
#endif
@@ -208,7 +212,6 @@
/* Main cleanup */
curl_global_cleanup();
convert_cleanup();
- metalink_cleanup();
#ifdef USE_NSS
if(PR_Initialized()) {
/* prevent valgrind from reporting still reachable mem from NSRP arenas */
@@ -225,51 +228,6 @@
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 +242,6 @@
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 +251,6 @@
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 +259,6 @@
}
#endif
- /* Perform any platform-specific terminal configuration */
- configure_terminal();
-
main_checkfds();
#if defined(HAVE_SIGNAL) && defined(SIGPIPE)
@@ -326,9 +279,6 @@
main_free(&global);
}
- /* Return the terminal to its original state */
- restore_terminal();
-
#ifdef __NOVELL_LIBC__
if(getenv("_IN_NETWARE_BASH_") == NULL)
tool_pressanykey();
