From 72158737375b191949ce0667760c340f3cbbbcd2 Mon Sep 17 00:00:00 2001 From: Keith Bowes Date: Thu, 18 Jan 2024 19:07:04 -0500 Subject: [PATCH 1/2] Use XDG_STATE_HOME for jackdbus logs --- dbus/jackdbus.c | 12 ++++++++---- dbus/jackdbus.h | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dbus/jackdbus.c b/dbus/jackdbus.c index 5f2000a37..505f5f857 100644 --- a/dbus/jackdbus.c +++ b/dbus/jackdbus.c @@ -694,7 +694,7 @@ pathname_cat(const char *pathname_a, const char *pathname_b) bool paths_init() { - const char *home_dir, *xdg_config_home, *xdg_log_home; + const char *home_dir, *xdg_config_home, *xdg_state_home; home_dir = getenv("HOME"); if (home_dir == NULL) @@ -709,17 +709,21 @@ paths_init() if (!(xdg_config_home = pathname_cat(home_dir, DEFAULT_XDG_CONFIG))) goto fail; } - if (!(xdg_log_home = pathname_cat(home_dir, DEFAULT_XDG_LOG))) goto fail; + xdg_state_home = getenv("XDG_STATE_HOME"); + if (xdg_state_home == NULL) + { + if (!(xdg_state_home = pathname_cat(home_dir, DEFAULT_XDG_STATE))) goto fail; + } if (!(g_jackdbus_config_dir = pathname_cat(xdg_config_home, JACKDBUS_DIR))) goto fail; - if (!(g_jackdbus_log_dir = pathname_cat(xdg_log_home, JACKDBUS_DIR))) goto fail; + if (!(g_jackdbus_log_dir = pathname_cat(xdg_state_home, JACKDBUS_DIR))) goto fail; if (!ensure_dir_exist(xdg_config_home, 0700)) { goto fail; } - if (!ensure_dir_exist(xdg_log_home, 0700)) + if (!ensure_dir_exist(xdg_state_home, 0700)) { goto fail; } diff --git a/dbus/jackdbus.h b/dbus/jackdbus.h index c0ab88613..7bcfdf318 100644 --- a/dbus/jackdbus.h +++ b/dbus/jackdbus.h @@ -29,7 +29,7 @@ //#define DISABLE_SIGNAL_MAGIC #define DEFAULT_XDG_CONFIG "/.config" -#define DEFAULT_XDG_LOG "/.log" +#define DEFAULT_XDG_STATE "/.local/state" #define JACKDBUS_DIR "/jack" #define JACKDBUS_LOG "/jackdbus.log" #define JACKDBUS_CONF "/conf.xml" From b7b60c947bf896b24b45ba06f912ba8a771a6af5 Mon Sep 17 00:00:00 2001 From: Keith Bowes Date: Mon, 15 Apr 2024 18:56:56 -0400 Subject: [PATCH 2/2] Fixed indentation and removed leaky, unnecessary xdg_config_home and xdg_state_home variables --- dbus/jackdbus.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dbus/jackdbus.c b/dbus/jackdbus.c index 505f5f857..480cbed43 100644 --- a/dbus/jackdbus.c +++ b/dbus/jackdbus.c @@ -694,7 +694,7 @@ pathname_cat(const char *pathname_a, const char *pathname_b) bool paths_init() { - const char *home_dir, *xdg_config_home, *xdg_state_home; + const char *home_dir; home_dir = getenv("HOME"); if (home_dir == NULL) @@ -703,30 +703,30 @@ paths_init() goto fail; } - xdg_config_home = getenv("XDG_CONFIG_HOME"); - if (xdg_config_home == NULL) - { - if (!(xdg_config_home = pathname_cat(home_dir, DEFAULT_XDG_CONFIG))) goto fail; - } + g_jackdbus_config_dir = getenv("XDG_CONFIG_HOME"); + if (g_jackdbus_config_dir == NULL) + { + if (!(g_jackdbus_config_dir = pathname_cat(home_dir, DEFAULT_XDG_CONFIG))) goto fail; + } - xdg_state_home = getenv("XDG_STATE_HOME"); - if (xdg_state_home == NULL) + g_jackdbus_log_dir = getenv("XDG_STATE_HOME"); + if (g_jackdbus_log_dir == NULL) { - if (!(xdg_state_home = pathname_cat(home_dir, DEFAULT_XDG_STATE))) goto fail; + if (!(g_jackdbus_log_dir = pathname_cat(home_dir, DEFAULT_XDG_STATE))) goto fail; } - if (!(g_jackdbus_config_dir = pathname_cat(xdg_config_home, JACKDBUS_DIR))) goto fail; - if (!(g_jackdbus_log_dir = pathname_cat(xdg_state_home, JACKDBUS_DIR))) goto fail; - if (!ensure_dir_exist(xdg_config_home, 0700)) + if (!ensure_dir_exist(g_jackdbus_config_dir, 0700)) { goto fail; } + if (!(g_jackdbus_config_dir = pathname_cat(g_jackdbus_config_dir, JACKDBUS_DIR))) goto fail; - if (!ensure_dir_exist(xdg_state_home, 0700)) + if (!ensure_dir_exist(g_jackdbus_log_dir, 0700)) { goto fail; } + if (!(g_jackdbus_log_dir = pathname_cat(g_jackdbus_log_dir, JACKDBUS_DIR))) goto fail; if (!ensure_dir_exist(g_jackdbus_config_dir, 0700)) {