fdo-mirrors/wireplumber
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/wireplumber.git synced 2026-01-09 16:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: always return the full path from wp_get_config/data_dir

Browse source 
Remove the need for the caller to check if the returned path is absolute or
relative.
This commit is contained in:
Peter Hutterer 2021-07-07 15:53:05 +10:00 • committed by George Kiagiadakis
parent 2e88a115d1
commit 153e84c8b8
1 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
lib/wp/wp.c
View file

@ -114,33 +114,41 @@ wp_get_xdg_config_dir (void)
}
/*!
* \brief Gets the Wireplumber configuration directory
* \brief Gets the full path to the Wireplumber configuration directory
* \returns The Wireplumber configuration directory
*/
const gchar *
wp_get_config_dir (void)
{
static const gchar *config_dir = NULL;
if (!config_dir) {
config_dir = g_getenv ("WIREPLUMBER_CONFIG_DIR");
if (!config_dir)
config_dir = WIREPLUMBER_DEFAULT_CONFIG_DIR;
static gchar config_dir[PATH_MAX] = {0};
if (config_dir[0] == '\0') {
g_autofree gchar *abspath;
const gchar *path = g_getenv ("WIREPLUMBER_CONFIG_DIR");
if (!path)
path = WIREPLUMBER_DEFAULT_CONFIG_DIR;
abspath = g_canonicalize_filename (path, NULL);
g_strlcpy (config_dir, abspath, sizeof (config_dir));
}
return config_dir;
}
/*!
* \brief Gets the Wireplumber data directory
* \brief Gets full path to the Wireplumber data directory
* \returns The Wireplumber data directory
*/
const gchar *
wp_get_data_dir (void)
{
static const gchar *data_dir = NULL;
if (!data_dir) {
data_dir = g_getenv ("WIREPLUMBER_DATA_DIR");
if (!data_dir)
data_dir = WIREPLUMBER_DEFAULT_DATA_DIR;
static gchar data_dir[PATH_MAX] = {0};
if (data_dir[0] == '\0') {
g_autofree gchar *abspath;
const char *path = g_getenv ("WIREPLUMBER_DATA_DIR");
if (!path)
path = WIREPLUMBER_DEFAULT_DATA_DIR;
abspath = g_canonicalize_filename (path, NULL);
g_strlcpy (data_dir, abspath, sizeof (data_dir));
}
return data_dir;
}