generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

David Byron cleaned up how --trace with no option was treated, and also

Browse Source 
arguments in a config file without a required parameter!
This commit is contained in:
Daniel Stenberg
2004-01-19 22:15:59 +00:00
parent f44bc85545
commit 2431b2caff
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main.c
View File

@@ -2117,12 +2117,21 @@ static int parseconfig(const char *filename,
line++; line++;
*line=0; /* zero terminate */ *line=0; /* zero terminate */
} }
if (param && !*param) {
/* do this so getparameter can check for required parameters.
Otherwise it always thinks there's a parameter. */
if (alloced_param)
free(param);
param = NULL;
}
#ifdef DEBUG_CONFIG #ifdef DEBUG_CONFIG
fprintf(stderr, "PARAM: \"%s\"\n", param); fprintf(stderr, "PARAM: \"%s\"\n",(param ? param : "(null)"));
#endif #endif
res = getparameter(option, param, &usedarg, config); res = getparameter(option, param, &usedarg, config);
if(*param && !usedarg) if (param && *param && !usedarg)
/* we passed in a parameter that wasn't used! */ /* we passed in a parameter that wasn't used! */
res = PARAM_GOT_EXTRA_PARAMETER; res = PARAM_GOT_EXTRA_PARAMETER;
@@ -2139,7 +2148,10 @@ static int parseconfig(const char *filename,
} }
if(alloced_param) if(alloced_param)
{
free(param); free(param);
param = NULL;
}
free(aline); free(aline);
} }
@@ -3371,7 +3383,7 @@ operate(struct Configurable *config, int argc, char *argv[])
if(config->headerfile && !headerfilep && heads.stream) if(config->headerfile && !headerfilep && heads.stream)
fclose(heads.stream); fclose(heads.stream);
if(config->trace_fopened) if(config->trace_fopened && config->trace_stream)
fclose(config->trace_stream); fclose(config->trace_stream);
if(allocuseragent) if(allocuseragent)