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

tool_urlglob: polish, cleanups, improvements

Browse source 
- assert instead of printing "internal error" for unlikely events
- avoid allocating the main struct
- convert globerror() from macro to function
- renames to shorter and clearer names
- malloc + copy => memdup0
- change buffer handling to dynbuf
- realloc to handle more globs, but use less memory for few

Closes #18198
This commit is contained in:
Daniel Stenberg 2025-08-05 16:00:20 +02:00
parent 6d5570c4dd
commit 034612cd51
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
4 changed files with 213 additions and 244 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/tool_operate.c
View file

@ -348,7 +348,7 @@ void single_transfer_cleanup(struct OperationConfig *config)
state = &config->state;
/* Free list of remaining URLs */
glob_cleanup(&state->urls);
glob_cleanup(&state->urlglob);
state->outfiles = NULL;
tool_safefree(state->uploadfile);
/* Free list of globbed upload files */
@ -862,7 +862,7 @@ static CURLcode etag_store(struct OperationConfig *config,
warnf(config->global, "Failed creating file for saving etags: \"%s\". "
"Skip this transfer", config->etag_save_file);
state->outfiles = NULL;
glob_cleanup(&state->urls);
glob_cleanup(&state->urlglob);
*skip = TRUE;
return CURLE_OK;
}
@ -955,10 +955,11 @@ static CURLcode setup_outfile(struct OperationConfig *config,
return result;
}
}
else if(state->urls) {
else if(glob_inuse(&state->urlglob)) {
/* fill '#1' ... '#9' terms from URL pattern */
char *storefile = per->outfile;
CURLcode result = glob_match_url(&per->outfile, storefile, state->urls);
CURLcode result =
glob_match_url(&per->outfile, storefile, &state->urlglob);
tool_safefree(storefile);
if(result) {
/* bad globbing */
@ -1153,7 +1154,7 @@ static CURLcode single_transfer(struct OperationConfig *config,
if(u->outfile && !state->outfiles)
state->outfiles = u->outfile;
if(!config->globoff && u->infile && !state->inglob) {
if(!config->globoff && u->infile && !glob_inuse(&state->inglob)) {
/* Unless explicitly shut off */
result = glob_url(&state->inglob, u->infile, &state->infilenum,
(!global->silent || global->showerror) ?
@ -1165,8 +1166,8 @@ static CURLcode single_transfer(struct OperationConfig *config,
if(state->up || u->infile) {
if(!state->uploadfile) {
if(state->inglob) {
result = glob_next_url(&state->uploadfile, state->inglob);
if(glob_inuse(&state->inglob)) {
result = glob_next_url(&state->uploadfile, &state->inglob);
if(result == CURLE_OUT_OF_MEMORY)
errorf(global, "out of memory");
}
@ -1184,7 +1185,7 @@ static CURLcode single_transfer(struct OperationConfig *config,
if(!config->globoff && !u->noglob) {
/* Unless explicitly shut off, we expand '{...}' and '[...]'
expressions and return total number of URLs in pattern set */
result = glob_url(&state->urls, u->url, &state->urlnum,
result = glob_url(&state->urlglob, u->url, &state->urlnum,
(!global->silent || global->showerror) ?
tool_stderr : NULL);
if(result)
@ -1268,8 +1269,8 @@ static CURLcode single_transfer(struct OperationConfig *config,
/* default output stream is stdout */
outs->stream = stdout;
if(state->urls) {
result = glob_next_url(&per->url, state->urls);
if(glob_inuse(&state->urlglob)) {
result = glob_next_url(&per->url, &state->urlglob);
if(result)
return result;
}
@ -1371,7 +1372,7 @@ static CURLcode single_transfer(struct OperationConfig *config,
if(state->li >= state->urlnum) {
state->li = 0;
state->urlnum = 0; /* forced reglob of URLs */
glob_cleanup(&state->urls);
glob_cleanup(&state->urlglob);
state->up++;
tool_safefree(state->uploadfile); /* clear it to get the next */
}
@ -1383,7 +1384,7 @@ static CURLcode single_transfer(struct OperationConfig *config,
node itself nor modifying next pointer. */
u->outset = u->urlset = u->useremote =
u->uploadset = u->noupload = u->noglob = FALSE;
glob_cleanup(&state->urls);
glob_cleanup(&state->urlglob);
state->urlnum = 0;
state->outfiles = NULL;