romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-31 23:48:22 +03:00
Code Issues Projects Releases Packages Wiki Activity

tool_parsecfg: make my_get_line skip comments and newlines

Browse source 
- brings this functionality to all users of this function automatically
  and consistently

- consistently returns every line without trailing \n

Closes #16590
This commit is contained in:
Daniel Stenberg 2025-03-06 11:38:23 +01:00
parent d398fffae0
commit a7fda9a8f4
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
3 changed files with 41 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/tool_getparam.c
View file

@ -1113,29 +1113,9 @@ static ParameterError parse_url(struct GlobalConfig *global,
if(f) {
curlx_dyn_init(&line, 8092);
while(my_get_line(f, &line, &error)) {
/* every line has a newline that we strip off */
size_t len = curlx_dyn_len(&line);
const char *ptr;
if(len)
curlx_dyn_setlen(&line, len - 1);
ptr = curlx_dyn_ptr(&line);
/* line with # in the first non-blank column is a comment! */
while(*ptr && ISSPACE(*ptr))
ptr++;
const char *ptr = curlx_dyn_ptr(&line);
switch(*ptr) {
case '#':
case '/':
case '\r':
case '\n':
case '*':
case '\0':
/* comment or weird line, skip it */
break;
default:
err = add_url(global, config, ptr, GETOUT_USEREMOTE | GETOUT_NOGLOB);
break;
}
err = add_url(global, config, ptr, GETOUT_USEREMOTE | GETOUT_NOGLOB);
if(err)
break;
curlx_dyn_reset(&line);
@ -1295,18 +1275,12 @@ static ParameterError parse_header(struct GlobalConfig *global,
bool error = FALSE;
curlx_dyn_init(&line, 1024*100);
while(my_get_line(file, &line, &error)) {
/* every line has a newline that we strip off */
size_t len = curlx_dyn_len(&line);
if(len) {
const char *ptr;
curlx_dyn_setlen(&line, len - 1);
ptr = curlx_dyn_ptr(&line);
err = add2list(cmd == C_PROXY_HEADER ? /* --proxy-header? */
&config->proxyheaders :
&config->headers, ptr);
if(err)
break;
}
const char *ptr = curlx_dyn_ptr(&line);
err = add2list(cmd == C_PROXY_HEADER ? /* --proxy-header? */
&config->proxyheaders :
&config->headers, ptr);
if(err)
break;
}
if(error)
err = PARAM_READ_ERROR;