mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

core-util: when searching for configuration files, honour XDG basedir spec

Browse source
This commit is contained in:
Lennart Poettering 2012-05-15 23:25:00 +02:00
parent 4bc865ad6e
commit 9ab510a692
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/pulsecore/core-util.c
View file

@ -1792,15 +1792,22 @@ FILE *pa_open_config_file(const char *global, const char *local, const char *env
char *lfn; char *lfn;
char *h; char *h;
if ((e = getenv("PULSE_CONFIG_PATH"))) if ((e = getenv("PULSE_CONFIG_PATH"))) {
fn = lfn = pa_sprintf_malloc("%s" PA_PATH_SEP "%s", e, local); fn = lfn = pa_sprintf_malloc("%s" PA_PATH_SEP "%s", e, local);
else if ((h = pa_get_home_dir_malloc())) { f = pa_fopen_cloexec(fn, "r");
} else if ((h = pa_get_home_dir_malloc())) {
fn = lfn = pa_sprintf_malloc("%s" PA_PATH_SEP ".pulse" PA_PATH_SEP "%s", h, local); fn = lfn = pa_sprintf_malloc("%s" PA_PATH_SEP ".pulse" PA_PATH_SEP "%s", h, local);
f = pa_fopen_cloexec(fn, "r");
if (!f) {
free(lfn);
fn = lfn = pa_sprintf_malloc("%s" PA_PATH_SEP ".config/pulse" PA_PATH_SEP "%s", h, local);
f = pa_fopen_cloexec(fn, "r");
}
pa_xfree(h); pa_xfree(h);
} else } else
return NULL; return NULL;
if ((f = pa_fopen_cloexec(fn, "r"))) { if (f) {
if (result) if (result)
*result = pa_xstrdup(fn); *result = pa_xstrdup(fn);