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

Kevin Roth's bugreport with config files containing '-v defaulturl' is now

Browse Source 
fixed
This commit is contained in:
Daniel Stenberg 2000-10-26 08:15:13 +00:00
parent 68c231e1b0
commit a5b01cf4e8
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/main.c
View File

@ -980,38 +980,31 @@ static int parseconfig(char *filename,
else else
file = stdin; file = stdin;
if(file) if(file) {
{
char *line; char *line;
char *tok1; char *tok1;
char *tok2; char *tok2;
while (NULL != (line = my_get_line(file))) while (NULL != (line = my_get_line(file))) {
{
/* lines with # in the fist column is a comment! */ /* lines with # in the fist column is a comment! */
if ('#' == line[0]) if ('#' == line[0]) {
{
free(line); free(line);
continue; continue;
} }
if (NULL == (tok1 = my_get_token(line))) if (NULL == (tok1 = my_get_token(line))) {
{
free(line); free(line);
continue; continue;
} }
if ('-' != tok1[0]) if ('-' != tok1[0]) {
{
if (config->url) if (config->url)
free(config->url); free(config->url);
config->url = tok1; config->url = tok1;
} }
while ((NULL != tok1) && ('-' == tok1[0])) while ((NULL != tok1) && ('-' == tok1[0])) {
{
tok2 = my_get_token(NULL); tok2 = my_get_token(NULL);
while (NULL == tok2) while (NULL == tok2) {
{
free(line); free(line);
if (NULL == (line = my_get_line(file))) if (NULL == (line = my_get_line(file)))
break; break;
@ -1022,10 +1015,18 @@ static int parseconfig(char *filename,
res = getparameter(tok1 + 1, tok2, &usedarg, config); res = getparameter(tok1 + 1, tok2, &usedarg, config);
free(tok1); free(tok1);
if (!usedarg) if (!usedarg) {
tok1 = tok2; if ('-' != tok2[0]) {
else /* this is not an option, this is a URL */
{ if (config->url)
free(config->url);
config->url = tok2;
break;
}
else
tok1 = tok2;
}
else {
free(tok2); free(tok2);
break; break;
} }