diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2022-08-12 21:53:50 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2022-08-15 19:06:43 +0300 |
| commit | d36ad8b2a0e7a7b05853d9e397c93b6f42cc7f03 (patch) | |
| tree | 45a0204786e28b80694abebb262da9b97b821479 /curl/curl/tool_main.c | |
| parent | ada686edff5697ef477047676a0835bc52c5af35 (diff) | |
Upgrade to 7.84.0
Diffstat (limited to 'curl/curl/tool_main.c')
| -rw-r--r-- | curl/curl/tool_main.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/curl/curl/tool_main.c b/curl/curl/tool_main.c index 913f8d6..15caf3c 100644 --- a/curl/curl/tool_main.c +++ b/curl/curl/tool_main.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #include "tool_setup.h" @@ -45,7 +47,6 @@ #include "curlx.h" #include "tool_cfgable.h" -#include "tool_convert.h" #include "tool_doswin.h" #include "tool_msgs.h" #include "tool_operate.h" @@ -122,7 +123,7 @@ static void memory_tracking_init(void) curl_free(env); curl_dbg_memdebug(fname); /* this weird stuff here is to make curl_free() get called before - curl_gdb_memdebug() as otherwise memory tracking will log a free() + curl_dbg_memdebug() as otherwise memory tracking will log a free() without an alloc! */ } /* if CURL_MEMLIMIT is set, this enables fail-on-alloc-number-N feature */ @@ -250,11 +251,9 @@ static void main_free(struct GlobalConfig *config) /* Cleanup the easy handle */ /* 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 */ + /* prevent valgrind from reporting still reachable mem from NSPR arenas */ PL_ArenaFinish(); /* prevent valgrind from reporting possibly lost memory (fd cache, ...) */ PR_Cleanup(); @@ -319,8 +318,13 @@ int main(int argc, char *argv[]) main_free(&global); } +#ifdef WIN32 + /* Flush buffers of all streams opened in write or update mode */ + fflush(NULL); +#endif + #ifdef __NOVELL_LIBC__ - if(getenv("_IN_NETWARE_BASH_") == NULL) + if(!getenv("_IN_NETWARE_BASH_")) tool_pressanykey(); #endif |