moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00
Code Issues Releases Wiki Activity

tool_operate: Moved .curlrc parsing code into operate()

Browse Source
This commit is contained in:
Steve Holme 2014-02-05 20:28:36 +00:00
parent 61ba1daba0
commit f8abd56450
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/tool_operate.c
View File

@ -235,18 +235,6 @@ static int operate_do(struct Configurable *config, int argc,
** from outside of nested loops further down below.
*/
/* Parse .curlrc if necessary */
if((argc == 1) || (!curlx_strequal(argv[1], "-q"))) {
parseconfig(NULL, config); /* ignore possible failure */
/* If we had no arguments then make sure a url was specified in .curlrc */
if((argc < 2) && (!config->url_list)) {
helpf(config->errors, NULL);
res = CURLE_FAILED_INIT;
goto quit_curl;
}
}
/* Parse the command line arguments */
res = parse_args(config, argc, argv);
if(res) {
@ -1856,8 +1844,20 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[])
if(result)
return result;
/* Perform the main operation */
result = operate_do(config, argc, argv);
/* Parse .curlrc if necessary */
if((argc == 1) || (!curlx_strequal(argv[1], "-q"))) {
parseconfig(NULL, config); /* ignore possible failure */
/* If we had no arguments then make sure a url was specified in .curlrc */
if((argc < 2) && (!config->url_list)) {
helpf(config->errors, NULL);
result = CURLE_FAILED_INIT;
}
}
if(!result)
/* Perform the main operation */
result = operate_do(config, argc, argv);
/* Perform the cleanup */
operate_free(config);