mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-04 13:30:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

dlsym: add support for ALSA_PLUGIN_DIR environment variable

Browse source 
In some cases, it may be useful to specify the plugin directory
using the environment variable.

BugLink: https://github.com/alsa-project/alsa-lib/issues/82
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2020-10-13 10:43:44 +02:00
parent 4f90392f07
commit 8580c081c2
1 changed files with 30 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/dlmisc.c
View file

@ -43,8 +43,8 @@
struct snd_dlsym_link *snd_dlsym_start = NULL; struct snd_dlsym_link *snd_dlsym_start = NULL;
#endif #endif
#ifdef DL_ORIGIN_AVAILABLE #ifdef DL_ORIGIN_AVAILABLE
static int snd_libdir_plugin_dir_set = 0; static int snd_plugin_dir_set = 0;
static char *snd_libdir_origin = NULL; static char *snd_plugin_dir = NULL;
#endif #endif
#endif #endif
@ -65,6 +65,22 @@ static inline void snd_dlpath_lock(void) {}
static inline void snd_dlpath_unlock(void) {} static inline void snd_dlpath_unlock(void) {}
#endif #endif
static void snd_dlinfo_origin(char *path, size_t path_len)
{
#ifdef DL_ORIGIN_AVAILABLE
struct link_map *links;
Dl_info info;
char origin[PATH_MAX];
if (dladdr1(&snd_dlpath, &info, (void**)&links, RTLD_DL_LINKMAP) == 0)
return;
if (dlinfo(links, RTLD_DI_ORIGIN, origin))
return;
snprintf(path, path_len, "%s/alsa-lib", origin);
if (access(path, X_OK) == 0)
snd_plugin_dir = strdup(path);
#endif
}
/** /**
* *
* \brief Compose the dynamic path * \brief Compose the dynamic path
@ -75,30 +91,19 @@ static inline void snd_dlpath_unlock(void) {}
*/ */
int snd_dlpath(char *path, size_t path_len, const char *name) int snd_dlpath(char *path, size_t path_len, const char *name)
{ {
#ifdef DL_ORIGIN_AVAILABLE
snd_dlpath_lock(); snd_dlpath_lock();
if (!snd_libdir_plugin_dir_set) { if (!snd_plugin_dir_set) {
struct link_map *links; const char *env = getenv("ALSA_PLUGIN_DIR");
Dl_info info; if (env) {
char origin[PATH_MAX]; snd_plugin_dir = strdup(env);
if (dladdr1(&snd_dlpath, &info, (void**)&links, RTLD_DL_LINKMAP) == 0) } else {
links = NULL; snd_dlinfo_origin(path, path_len);
if (links != NULL && dlinfo(links, RTLD_DI_ORIGIN, origin) == 0) {
snprintf(path, path_len, "%s/alsa-lib", origin);
if (access(path, X_OK) == 0)
snd_libdir_origin = strdup(origin);
} }
snd_libdir_plugin_dir_set = 1; snd_plugin_dir_set = 1;
}
if (snd_libdir_origin) {
snprintf(path, path_len, "%s/alsa-lib/%s", snd_libdir_origin, name);
} else {
snprintf(path, path_len, "%s/%s", ALSA_PLUGIN_DIR, name);
} }
snprintf(path, path_len, "%s/%s",
snd_plugin_dir ? snd_plugin_dir : ALSA_PLUGIN_DIR, name);
snd_dlpath_unlock(); snd_dlpath_unlock();
#else
snprintf(path, path_len, "%s/%s", ALSA_PLUGIN_DIR, name);
#endif
return 0; return 0;
} }
@ -450,9 +455,9 @@ void snd_dlobj_cache_cleanup(void)
snd_dlobj_unlock(); snd_dlobj_unlock();
#ifdef DL_ORIGIN_AVAILABLE #ifdef DL_ORIGIN_AVAILABLE
snd_dlpath_lock(); snd_dlpath_lock();
snd_libdir_plugin_dir_set = 0; snd_plugin_dir_set = 0;
free(snd_libdir_origin); free(snd_plugin_dir);
snd_libdir_origin = NULL; snd_plugin_dir = NULL;
snd_dlpath_unlock(); snd_dlpath_unlock();
#endif #endif
} }