mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-21 05:33:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

config: use fallback when XDG_CONFIG_{HOME,DIRS} is set, but empty

Browse source
This commit is contained in:
Daniel Eklöf 2022-04-06 20:54:04 +02:00
parent 20608c987b
commit c7dd30742a
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config.c
View file

@ -414,7 +414,7 @@ open_config(void)
char *xdg_config_dirs_copy = NULL; char *xdg_config_dirs_copy = NULL;
/* Use XDG_CONFIG_HOME, or ~/.config */ /* Use XDG_CONFIG_HOME, or ~/.config */
if (xdg_config_home != NULL) { if (xdg_config_home != NULL && xdg_config_home[0] != '\0') {
int fd = open(xdg_config_home, O_RDONLY); int fd = open(xdg_config_home, O_RDONLY);
if (fd >= 0) if (fd >= 0)
path_component_add(&components, xdg_config_home, fd); path_component_add(&components, xdg_config_home, fd);
@ -447,7 +447,7 @@ open_config(void)
/* Finally, try foot/foot.ini in all XDG_CONFIG_DIRS, or /etc/xdg /* Finally, try foot/foot.ini in all XDG_CONFIG_DIRS, or /etc/xdg
* if unset */ * if unset */
const char *xdg_config_dirs = getenv("XDG_CONFIG_DIRS"); const char *xdg_config_dirs = getenv("XDG_CONFIG_DIRS");
xdg_config_dirs_copy = xdg_config_dirs != NULL xdg_config_dirs_copy = xdg_config_dirs != NULL && xdg_config_dirs[0] != '\0'
? strdup(xdg_config_dirs) ? strdup(xdg_config_dirs)
: strdup("/etc/xdg"); : strdup("/etc/xdg");