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

cli-command: Use pa_module_exists() in .ifexists

Browse source
This commit is contained in:
João Paulo Rechi Vita 2013-09-24 19:45:58 -03:00 • committed by Tanu Kaskinen
parent 48d23d4863
commit 1ea8a2bdae
1 changed files with 1 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/pulsecore/cli-command.c
View file

@ -2105,46 +2105,7 @@ int pa_cli_command_execute_line_stateful(pa_core *c, const char *s, pa_strbuf *b
return -1;
} else {
const char *filename = cs+l+strspn(cs+l, whitespace);
/* Search DL_SEARCH_PATH unless the filename is absolute */
if (filename[0] == PA_PATH_SEP_CHAR) {
*ifstate = access(filename, F_OK) == 0 ? IFSTATE_TRUE : IFSTATE_FALSE;
pa_log_debug("Checking for existence of '%s': %s", filename, *ifstate == IFSTATE_TRUE ? "success" : "failure");
} else {
const char *paths, *state = NULL;
char *p;
if (!(paths = lt_dlgetsearchpath()))
return -1;
while ((p = pa_split(paths, ":", &state))) {
char *pathname;
pathname = pa_sprintf_malloc("%s" PA_PATH_SEP "%s", p, filename);
*ifstate = access(pathname, F_OK) == 0 ? IFSTATE_TRUE : IFSTATE_FALSE;
pa_log_debug("Checking for existence of '%s': %s", pathname, *ifstate == IFSTATE_TRUE ? "success" : "failure");
if (PA_UNLIKELY(pa_run_from_build_tree())) {
/* If run from the build tree, search in <path>/.libs as well */
char *ltpathname = pa_sprintf_malloc("%s" PA_PATH_SEP ".libs" PA_PATH_SEP "%s", p, filename);
*ifstate = access(ltpathname, F_OK) == 0 ? IFSTATE_TRUE : IFSTATE_FALSE;
pa_log_debug("Checking for existence of '%s': %s", ltpathname, *ifstate == IFSTATE_TRUE ? "success" : "failure");
pa_xfree(ltpathname);
}
pa_xfree(p);
pa_xfree(pathname);
if (*ifstate == IFSTATE_TRUE)
break;
}
}
*ifstate = pa_module_exists(filename) ? IFSTATE_TRUE : IFSTATE_FALSE;
}
} else {
pa_strbuf_printf(buf, "Invalid meta command: %s\n", cs);