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

Don't abort config loading when the user specific cannot be loaded.

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1423 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Pierre Ossman 2007-02-05 10:26:14 +00:00
parent 4171f2504a
commit f65ab1b3eb
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -184,7 +184,7 @@ int pa_make_secure_dir(const char* dir, mode_t m, uid_t uid, gid_t gid) {
goto fail; goto fail;
} }
#else #else
pa_log_warn("secure directory creation not supported on Win32."); pa_log_warn("secure directory creation not supported on Win32.");
#endif #endif
return 0; return 0;
@ -953,13 +953,19 @@ FILE *pa_open_config_file(const char *global, const char *local, const char *env
fn = buf; fn = buf;
#endif #endif
if ((f = fopen(fn, mode)) || errno != ENOENT) { f = fopen(fn, mode);
if (f != NULL) {
if (result) if (result)
*result = pa_xstrdup(fn); *result = pa_xstrdup(fn);
pa_xfree(lfn); pa_xfree(lfn);
return f; return f;
} }
if (errno != ENOENT) {
pa_log_warn("WARNING: failed to open configuration file '%s': %s",
lfn, pa_cstrerror(errno));
}
pa_xfree(lfn); pa_xfree(lfn);
} }
} }