tool_operate: Moved .curlrc parsing code into operate() (f8abd564) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

src/tool_operate.c

+14 −14

Original line number	Diff line number	Diff line
		@@ -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,6 +1844,18 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[])
		if(result)
		return result;

		/* 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);