mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-05 13:29:57 -05:00
Find modules and config files relative to the installed libraries.
Do not use replace %PULSE_ROOT% from the environment.
This commit is contained in:
Maarten Bosmans
parent
8852b80df8
commit
eb833da570
5 changed files with 67 additions and 86 deletions
|
|
@ -37,11 +37,7 @@ dbuspolicydir=$(sysconfdir)/dbus-1/system.d
|
|||
###################################
|
||||
|
||||
PA_BINARY=$(bindir)/pulseaudio$(EXEEXT)
|
||||
if OS_IS_WIN32
|
||||
PA_DEFAULT_CONFIG_DIR=%PULSE_ROOT%
|
||||
else
|
||||
PA_DEFAULT_CONFIG_DIR=$(pulseconfdir)
|
||||
endif
|
||||
|
||||
###################################
|
||||
# Compiler/linker flags #
|
||||
|
|
|
|||
|
|
@ -159,7 +159,21 @@ pa_daemon_conf* pa_daemon_conf_new(void) {
|
|||
} else
|
||||
|
||||
#endif
|
||||
#ifdef OS_IS_WIN32
|
||||
{
|
||||
char *t;
|
||||
char *majorminor = pa_xstrdup(VERSION);
|
||||
char *toplevel = pa_win32_get_toplevel(NULL);
|
||||
|
||||
if ((t = strchr(majorminor, '-')))
|
||||
*t = '\0';
|
||||
|
||||
c->dl_search_path = pa_sprintf_malloc("%s" PA_PATH_SEP "lib" PA_PATH_SEP "pulse-%s" PA_PATH_SEP "modules", toplevel, majorminor);
|
||||
pa_xfree(majorminor);
|
||||
}
|
||||
#else
|
||||
c->dl_search_path = pa_xstrdup(PA_DLSEARCHPATH);
|
||||
#endif
|
||||
|
||||
return c;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -146,24 +146,29 @@ static pa_strlist *recorded_env = NULL;
|
|||
|
||||
#ifdef OS_IS_WIN32
|
||||
|
||||
#define PULSE_ROOTENV "PULSE_ROOT"
|
||||
/* Returns the directory of the current DLL, with '/bin/' removed if it is the last component */
|
||||
char *pa_win32_get_toplevel(HANDLE handle) {
|
||||
static char *toplevel = NULL;
|
||||
|
||||
int pa_set_root(HANDLE handle) {
|
||||
char library_path[MAX_PATH], *sep;
|
||||
|
||||
/* FIXME: Needs to set errno */
|
||||
if (!toplevel) {
|
||||
char library_path[MAX_PATH];
|
||||
char *p;
|
||||
|
||||
if (!GetModuleFileName(handle, library_path, MAX_PATH))
|
||||
return 0;
|
||||
return NULL;
|
||||
|
||||
sep = strrchr(library_path, PA_PATH_SEP_CHAR);
|
||||
if (sep)
|
||||
*sep = '\0';
|
||||
toplevel = pa_xstrdup(library_path);
|
||||
|
||||
if (!SetEnvironmentVariable(PULSE_ROOTENV, library_path))
|
||||
return 0;
|
||||
p = strrchr(toplevel, PA_PATH_SEP_CHAR);
|
||||
if (p)
|
||||
*p = '\0';
|
||||
|
||||
return 1;
|
||||
p = strrchr(toplevel, PA_PATH_SEP_CHAR);
|
||||
if (p && (strcmp(p + 1, "bin") == 0))
|
||||
*p = '\0';
|
||||
}
|
||||
|
||||
return toplevel;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
@ -1675,23 +1680,9 @@ fail:
|
|||
* stored there.*/
|
||||
FILE *pa_open_config_file(const char *global, const char *local, const char *env, char **result) {
|
||||
const char *fn;
|
||||
#ifdef OS_IS_WIN32
|
||||
char buf[PATH_MAX];
|
||||
|
||||
if (!getenv(PULSE_ROOTENV))
|
||||
pa_set_root(NULL);
|
||||
#endif
|
||||
|
||||
if (env && (fn = getenv(env))) {
|
||||
FILE *f;
|
||||
|
||||
#ifdef OS_IS_WIN32
|
||||
if (!ExpandEnvironmentStrings(fn, buf, PATH_MAX))
|
||||
/* FIXME: Needs to set errno! */
|
||||
return NULL;
|
||||
fn = buf;
|
||||
#endif
|
||||
|
||||
if (env && (fn = getenv(env))) {
|
||||
if ((f = pa_fopen_cloexec(fn, "r"))) {
|
||||
if (result)
|
||||
*result = pa_xstrdup(fn);
|
||||
|
|
@ -1707,7 +1698,6 @@ FILE *pa_open_config_file(const char *global, const char *local, const char *env
|
|||
const char *e;
|
||||
char *lfn;
|
||||
char *h;
|
||||
FILE *f;
|
||||
|
||||
if ((e = getenv("PULSE_CONFIG_PATH")))
|
||||
fn = lfn = pa_sprintf_malloc("%s" PA_PATH_SEP "%s", e, local);
|
||||
|
|
@ -1717,15 +1707,6 @@ FILE *pa_open_config_file(const char *global, const char *local, const char *env
|
|||
} else
|
||||
return NULL;
|
||||
|
||||
#ifdef OS_IS_WIN32
|
||||
if (!ExpandEnvironmentStrings(lfn, buf, PATH_MAX)) {
|
||||
/* FIXME: Needs to set errno! */
|
||||
pa_xfree(lfn);
|
||||
return NULL;
|
||||
}
|
||||
fn = buf;
|
||||
#endif
|
||||
|
||||
if ((f = pa_fopen_cloexec(fn, "r"))) {
|
||||
if (result)
|
||||
*result = pa_xstrdup(fn);
|
||||
|
|
@ -1744,22 +1725,26 @@ FILE *pa_open_config_file(const char *global, const char *local, const char *env
|
|||
}
|
||||
|
||||
if (global) {
|
||||
FILE *f;
|
||||
char *gfn;
|
||||
|
||||
#ifdef OS_IS_WIN32
|
||||
if (!ExpandEnvironmentStrings(global, buf, PATH_MAX))
|
||||
/* FIXME: Needs to set errno! */
|
||||
return NULL;
|
||||
global = buf;
|
||||
if (strncmp(global, PA_DEFAULT_CONFIG_DIR, strlen(PA_DEFAULT_CONFIG_DIR)) == 0)
|
||||
gfn = pa_sprintf_malloc("%s" PA_PATH_SEP "etc" PA_PATH_SEP "pulse%s",
|
||||
pa_win32_get_toplevel(NULL),
|
||||
global + strlen(PA_DEFAULT_CONFIG_DIR));
|
||||
else
|
||||
#endif
|
||||
gfn = pa_xstrdup(global);
|
||||
|
||||
if ((f = pa_fopen_cloexec(global, "r"))) {
|
||||
|
||||
if ((f = pa_fopen_cloexec(gfn, "r"))) {
|
||||
if (result)
|
||||
*result = pa_xstrdup(global);
|
||||
*result = gfn;
|
||||
else
|
||||
pa_xfree(gfn);
|
||||
|
||||
return f;
|
||||
}
|
||||
pa_xfree(gfn);
|
||||
}
|
||||
|
||||
errno = ENOENT;
|
||||
|
|
@ -1768,22 +1753,8 @@ FILE *pa_open_config_file(const char *global, const char *local, const char *env
|
|||
|
||||
char *pa_find_config_file(const char *global, const char *local, const char *env) {
|
||||
const char *fn;
|
||||
#ifdef OS_IS_WIN32
|
||||
char buf[PATH_MAX];
|
||||
|
||||
if (!getenv(PULSE_ROOTENV))
|
||||
pa_set_root(NULL);
|
||||
#endif
|
||||
|
||||
if (env && (fn = getenv(env))) {
|
||||
|
||||
#ifdef OS_IS_WIN32
|
||||
if (!ExpandEnvironmentStrings(fn, buf, PATH_MAX))
|
||||
/* FIXME: Needs to set errno! */
|
||||
return NULL;
|
||||
fn = buf;
|
||||
#endif
|
||||
|
||||
if (access(fn, R_OK) == 0)
|
||||
return pa_xstrdup(fn);
|
||||
|
||||
|
|
@ -1804,15 +1775,6 @@ char *pa_find_config_file(const char *global, const char *local, const char *env
|
|||
} else
|
||||
return NULL;
|
||||
|
||||
#ifdef OS_IS_WIN32
|
||||
if (!ExpandEnvironmentStrings(lfn, buf, PATH_MAX)) {
|
||||
/* FIXME: Needs to set errno! */
|
||||
pa_xfree(lfn);
|
||||
return NULL;
|
||||
}
|
||||
fn = buf;
|
||||
#endif
|
||||
|
||||
if (access(fn, R_OK) == 0) {
|
||||
char *r = pa_xstrdup(fn);
|
||||
pa_xfree(lfn);
|
||||
|
|
@ -1829,15 +1791,20 @@ char *pa_find_config_file(const char *global, const char *local, const char *env
|
|||
}
|
||||
|
||||
if (global) {
|
||||
#ifdef OS_IS_WIN32
|
||||
if (!ExpandEnvironmentStrings(global, buf, PATH_MAX))
|
||||
/* FIXME: Needs to set errno! */
|
||||
return NULL;
|
||||
global = buf;
|
||||
#endif
|
||||
char *gfn;
|
||||
|
||||
if (access(global, R_OK) == 0)
|
||||
return pa_xstrdup(global);
|
||||
#ifdef OS_IS_WIN32
|
||||
if (strncmp(global, PA_DEFAULT_CONFIG_DIR, strlen(PA_DEFAULT_CONFIG_DIR)) == 0)
|
||||
gfn = pa_sprintf_malloc("%s" PA_PATH_SEP "etc" PA_PATH_SEP "pulse%s",
|
||||
pa_win32_get_toplevel(NULL),
|
||||
global + strlen(PA_DEFAULT_CONFIG_DIR));
|
||||
else
|
||||
#endif
|
||||
gfn = pa_xstrdup(global);
|
||||
|
||||
if (access(gfn, R_OK) == 0)
|
||||
return gfn;
|
||||
pa_xfree(gfn);
|
||||
}
|
||||
|
||||
errno = ENOENT;
|
||||
|
|
|
|||
|
|
@ -271,4 +271,8 @@ void pa_nullify_stdfds(void);
|
|||
char *pa_read_line_from_file(const char *fn);
|
||||
pa_bool_t pa_running_in_vm(void);
|
||||
|
||||
#ifdef OS_IS_WIN32
|
||||
char *pa_win32_get_toplevel(HANDLE handle);
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
#include <windows.h>
|
||||
|
||||
extern pa_set_root(HANDLE handle);
|
||||
extern pa_win32_get_toplevel(HANDLE handle);
|
||||
|
||||
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
|
||||
WSADATA data;
|
||||
|
|
@ -39,7 +39,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
|
|||
switch (fdwReason) {
|
||||
|
||||
case DLL_PROCESS_ATTACH:
|
||||
if (!pa_set_root(hinstDLL))
|
||||
if (!pa_win32_get_toplevel(hinstDLL))
|
||||
return FALSE;
|
||||
WSAStartup(MAKEWORD(2, 0), &data);
|
||||
break;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue