From 71f4c0566537c087660dcf59044299d881d332e9 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 3 May 2002 09:47:25 +0000 Subject: -D now stores all headers to the same file if multiple URLs are given on the command line! --- src/main.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index 452edcc7b..ff572205a 100644 --- a/src/main.c +++ b/src/main.c @@ -2125,6 +2125,18 @@ operate(struct Configurable *config, int argc, char *argv[]) urlnode = config->url_list; + if(config->headerfile) { + /* open file for output: */ + if(strcmp(config->headerfile,"-")) { + heads.filename = config->headerfile; + headerfilep=NULL; + } + else + headerfilep=stdout; + heads.stream = headerfilep; + heads.config = config; + } + /* loop through the list of given URLs */ while(urlnode) { @@ -2291,18 +2303,6 @@ operate(struct Configurable *config, int argc, char *argv[]) config->resume_from_current) { config->resume_from = -1; /* -1 will then force get-it-yourself */ } - if(config->headerfile) { - /* open file for output: */ - if(strcmp(config->headerfile,"-")) { - heads.filename = config->headerfile; - headerfilep=NULL; - } - else - headerfilep=stdout; - heads.stream = headerfilep; - heads.config = config; - } - if(outs.stream && isatty(fileno(outs.stream)) && !(config->conf&(CONF_UPLOAD|CONF_HTTPPOST))) /* we send the output to a tty and it isn't an upload operation, @@ -2512,9 +2512,6 @@ operate(struct Configurable *config, int argc, char *argv[]) fprintf(config->errors, "curl: (%d) %s\n", res, errorbuffer); #endif - if(config->headerfile && !headerfilep && heads.stream) - fclose(heads.stream); - if (outfile && !strequal(outfile, "-") && outs.stream) fclose(outs.stream); @@ -2568,6 +2565,9 @@ operate(struct Configurable *config, int argc, char *argv[]) } /* while-loop through all URLs */ + if(config->headerfile && !headerfilep && heads.stream) + fclose(heads.stream); + if(allocuseragent) free(config->useragent); -- cgit v1.2.3