tool_operate: Simplified parse .curlrc decision logic (8034b08e) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

src/tool_operate.c

+8 −15

Original line number	Diff line number	Diff line
		@@ -239,24 +239,17 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[])
		setlocale(LC_ALL, "");
		#endif

		if((argc > 1) &&
		(!curlx_strnequal("--", argv[1], 2) && (argv[1][0] == '-')) &&
		strchr(argv[1], 'q')) {
		/*
		* The first flag, that is not a verbose name, but a shortname
		* and it includes the 'q' flag!
		*/
		;
		}
		else {
		/* Parse .curlrc if necessary */
		if((argc == 1) \|\| (!curlx_strequal(argv[1], "-q"))) {
		parseconfig(NULL, config); /* ignore possible failure */
		}

		if((argc < 2) && !config->url_list) {
		/* 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 options */
		for(i = 1, stillflags = TRUE; i < argc; i++) {