romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-06-04 06:24:16 +03:00
Code Issues Projects Releases Packages Wiki Activity

urlapi: simplify urlget_url somewhat

Browse source 
- make file_url() a separate function that returns a file:// URL
- group the checks that need scheme info

Closes #21856
This commit is contained in:
Daniel Stenberg 2026-06-03 10:20:02 +02:00
parent cf7919262d
commit ef8f68568f
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 26 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

44
lib/urlapi.c
View file

@ -1447,6 +1447,20 @@ static CURLUcode urlget_format(const CURLU *u, CURLUPart what,
return CURLUE_OK;
}
static CURLUcode file_url(const CURLU *u, char **part,
const char *fragmentsep,
const char *querysep)
{
char *url = curl_maprintf("file://%s%s%s%s%s",
u->path, querysep, u->query ? u->query : "",
fragmentsep, u->fragment ? u->fragment : "");
if(!url)
return CURLUE_OUT_OF_MEMORY;
*part = url;
return CURLUE_OK;
}
static CURLUcode urlget_url(const CURLU *u, char **part, unsigned int flags)
{
char *url;
@ -1458,11 +1472,8 @@ static CURLUcode urlget_url(const CURLU *u, char **part, unsigned int flags)
(u->query_present && flags & CURLU_GET_EMPTY)) ?
"?" : "";
char portbuf[7];
if(u->scheme && curl_strequal("file", u->scheme)) {
url = curl_maprintf("file://%s%s%s%s%s",
u->path, querysep, u->query ? u->query : "",
fragmentsep, u->fragment ? u->fragment : "");
}
if(curl_strequal("file", u->scheme))
return file_url(u, part, fragmentsep, querysep);
else if(!u->host)
return CURLUE_NO_HOST;
else {
@ -1479,25 +1490,22 @@ static CURLUcode urlget_url(const CURLU *u, char **part, unsigned int flags)
return CURLUE_NO_SCHEME;
h = Curl_get_scheme(scheme);
if(!port && (flags & CURLU_DEFAULT_PORT)) {
/* there is no stored port number, but asked to deliver
a default one for the scheme */
if(h) {
if(h) {
if(!port && (flags & CURLU_DEFAULT_PORT)) {
/* there is no stored port number, but asked to deliver a default one
for the scheme */
curl_msnprintf(portbuf, sizeof(portbuf), "%u", h->defport);
port = portbuf;
}
}
else if(port) {
/* there is a stored port number, but asked to inhibit if it matches
the default one for the scheme */
if(h && (h->defport == u->portnum) &&
(flags & CURLU_NO_DEFAULT_PORT))
else if(port && (h->defport == u->portnum) &&
(flags & CURLU_NO_DEFAULT_PORT))
/* there is a stored port number, but asked to inhibit if it matches
the default port for the scheme */
port = NULL;
if(!(h->flags & PROTOPT_URLOPTIONS))
options = NULL;
}
if(h && !(h->flags & PROTOPT_URLOPTIONS))
options = NULL;
if(u->host[0] == '[') {
if(u->zoneid) {
/* make it '[ host %25 zoneid ]' */