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

tool_operate: Moved main initialisation and cleanup code into tool_main

Browse source
This commit is contained in:
Steve Holme 2014-02-02 14:21:53 +00:00
parent c1daf6c0cd
commit b811200f64
4 changed files with 39 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/tool_main.c
View file

@ -115,6 +115,32 @@ static void memory_tracking_init(void)
# define memory_tracking_init() Curl_nop_stmt
#endif
/*
* This is the main global constructor for the app. Call this before
* _any_ libcurl usage. If this fails, *NO* libcurl functions may be
* used, or havoc may be the result.
*/
static CURLcode main_init(void)
{
#if defined(__DJGPP__) || defined(__GO32__)
/* stop stat() wasting time */
_djstat_flags |= _STAT_INODE | _STAT_EXEC_MAGIC | _STAT_DIRSIZE;
#endif
return curl_global_init(CURL_GLOBAL_DEFAULT);
}
/*
* This is the main global destructor for the app. Call this after
* _all_ libcurl usage is done.
*/
static void main_free(void)
{
curl_global_cleanup();
convert_cleanup();
metalink_cleanup();
}
/*
** curl tool main function.
*/
@ -139,8 +165,19 @@ int main(int argc, char *argv[])
/* Initialise the config */
init_config(config);
/* Start our curl operation */
res = operate(config, argc, argv);
/* Initialize the curl library - do not call any libcurl functions before
this point */
if(!main_init()) {
/* Start our curl operation */
res = operate(config, argc, argv);
/* Perform the main cleanup */
main_free();
}
else {
helpf(config->errors, "error initializing curl library\n");
res = CURLE_FAILED_INIT;
}
#ifdef __SYMBIAN32__
if(config->showerror)