diff options
author | Steve Holme <steve_holme@hotmail.com> | 2014-03-02 09:50:36 +0000 |
---|---|---|
committer | Steve Holme <steve_holme@hotmail.com> | 2014-03-02 10:42:53 +0000 |
commit | 7fef4016def79e35ef6194e9a44ef90075f84348 (patch) | |
tree | 47dfc72c033d43069adcf60d5e514a8588be2bf3 | |
parent | 68920b6c113f7e3dd873d4b2d98f712c187b3765 (diff) |
tool: Do not output libcurl source for the information only parameters
Ensure a source file isn't generated for the following informational
command line parameters when --libcurl is specified:
--help, --manual, --version and --engine list
As the output would only include a fairly empty looking main() function
and a call to curl_easy_init() and curl_easy_cleanup() when performed
with --engine list.
-rw-r--r-- | src/tool_operate.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/tool_operate.c b/src/tool_operate.c index 03907e7bd..689f769cb 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -1839,6 +1839,9 @@ CURLcode operate(struct GlobalConfig *config, int argc, argv_item_t argv[]) #ifndef CURL_DISABLE_LIBCURL_OPTION /* Cleanup the libcurl source output */ easysrc_cleanup(); + + /* Dump the libcurl code if previously enabled */ + dumpeasysrc(config); #endif } else @@ -1846,12 +1849,5 @@ CURLcode operate(struct GlobalConfig *config, int argc, argv_item_t argv[]) } } -#ifndef CURL_DISABLE_LIBCURL_OPTION - /* Dump the libcurl code if previously enabled. - NOTE: that this function relies on config->errors amongst other things - so not everything can be closed and cleaned before this is called */ - dumpeasysrc(config); -#endif - return result; } |