several minor fixes as pointed out by Bjrn Stenberg

This commit is contained in:
Daniel Stenberg 2000-06-14 14:26:53 +00:00
parent ec520ceefd
commit 3e20192ff2

View File

@ -895,6 +895,8 @@ static int parseconfig(char *filename,
free(tok2); free(tok2);
break; break;
} }
if(res)
break; /* error detected */
} }
free(line); free(line);
@ -945,7 +947,7 @@ int main(int argc, char *argv[])
URLGlob *urls; URLGlob *urls;
int urlnum; int urlnum;
char *outfiles = NULL; char *outfiles;
int separator = 0; int separator = 0;
FILE *infd = stdin; FILE *infd = stdin;
@ -955,7 +957,7 @@ int main(int argc, char *argv[])
bool stillflags=TRUE; bool stillflags=TRUE;
CURL *curl; CURL *curl;
int res=CURLE_OK; int res;
int i; int i;
outs.stream = stdout; outs.stream = stdout;
@ -1199,7 +1201,7 @@ int main(int argc, char *argv[])
config.errors = stderr; config.errors = stderr;
#ifdef WIN32 #ifdef WIN32
if(!config.outfile && !(config.flags & CONF_GETTEXT)) { if(!config.outfile && !(config.conf & CONF_GETTEXT)) {
/* We get the output to stdout and we have not got the ASCII/text flag, /* We get the output to stdout and we have not got the ASCII/text flag,
then set stdout to be binary */ then set stdout to be binary */
setmode( 1, O_BINARY ); setmode( 1, O_BINARY );