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

curl: find curlrc in XDG_CONFIG_HOME without leading dot

Browse source 
If XDG_CONFIG_HOME is set, look for XDG_CONFIG_HOME/curlrc - without a
leading dot in the filename.

Fixes #12129
Reported-by: Jat Satiro
Closes #14600
This commit is contained in:
Daniel Stenberg 2024-08-19 23:22:56 +02:00
parent 96b9027f16
commit 26e9d3a896
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/tool_findfile.c
View file

@ -51,7 +51,7 @@ struct finder {
in the findfile() function */
static const struct finder conf_list[] = {
{ "CURL_HOME", NULL, FALSE },
{ "XDG_CONFIG_HOME", NULL, FALSE }, /* index == 1, used in the code */
{ "XDG_CONFIG_HOME", NULL, TRUE },
{ "HOME", NULL, FALSE },
#ifdef _WIN32
{ "USERPROFILE", NULL, FALSE },
@ -102,7 +102,6 @@ static char *checkhome(const char *home, const char *fname, bool dotscore)
char *findfile(const char *fname, int dotscore)
{
int i;
bool xdg = FALSE;
DEBUGASSERT(fname && fname[0]);
DEBUGASSERT((dotscore != 1) || (fname[0] == '.'));
@ -114,8 +113,6 @@ char *findfile(const char *fname, int dotscore)
if(home) {
char *path;
const char *filename = fname;
if(i == 1 /* XDG_CONFIG_HOME */)
xdg = TRUE;
if(!home[0]) {
curl_free(home);
continue;
@ -128,7 +125,7 @@ char *findfile(const char *fname, int dotscore)
home = c;
}
if(conf_list[i].withoutdot) {
if(!dotscore || xdg) {
if(!dotscore) {
/* this is not looking for .curlrc, or the XDG_CONFIG_HOME was
defined so we skip the extended check */
curl_free(home);

4
tests/data/test433
View file

@ -20,7 +20,7 @@ Content-Type: text/1
#
# Client-side
<client>
<file1 name="%LOGDIR/.curlrc">
<file1 name="%LOGDIR/curlrc">
--next
header = "a: a"
data = "curlrc read"
@ -34,7 +34,7 @@ HOME=
CURL_HOME=
</setenv>
<name>
Verify XDG_CONFIG_HOME use to find .curlrc
Verify XDG_CONFIG_HOME use to find curlrc
</name>
<command option="no-q">
%HOSTIP:%HTTPPORT/%TESTNUMBER