p
/
liberty
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ignore empty XDG_*_DIRS env. variables 

As the specification says we should.  GLib does this as well.

It is still possible to achieve an empty set by using ":",
which are two non-absolute paths that should be ignored.
GLib doesn't implement this.  Thus, we're now better than GLib.
This commit is contained in:
Přemysl Eric Janouch 2021-09-26 08:13:58 +02:00
parent 960420df3e
commit a3ad5e7751
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
liberty.c
View File

@ -3247,7 +3247,7 @@ get_xdg_config_dirs (struct strv *out)
str_free (&config_home); str_free (&config_home);
const char *xdg_config_dirs; const char *xdg_config_dirs;
if (!(xdg_config_dirs = getenv ("XDG_CONFIG_DIRS"))) if (!(xdg_config_dirs = getenv ("XDG_CONFIG_DIRS")) || !*xdg_config_dirs)
xdg_config_dirs = "/etc/xdg"; xdg_config_dirs = "/etc/xdg";
cstr_split (xdg_config_dirs, ":", true, out); cstr_split (xdg_config_dirs, ":", true, out);
} }
@ -3272,7 +3272,7 @@ get_xdg_data_dirs (struct strv *out)
str_free (&data_home); str_free (&data_home);
const char *xdg_data_dirs; const char *xdg_data_dirs;
if (!(xdg_data_dirs = getenv ("XDG_DATA_DIRS"))) if (!(xdg_data_dirs = getenv ("XDG_DATA_DIRS")) || !*xdg_data_dirs)
xdg_data_dirs = "/usr/local/share/:/usr/share/"; xdg_data_dirs = "/usr/local/share/:/usr/share/";
cstr_split (xdg_data_dirs, ":", true, out); cstr_split (xdg_data_dirs, ":", true, out);
} }