about summary refs log tree commit diff stats
path: root/src/config
diff options
context:
space:
mode:
Diffstat (limited to 'src/config')
-rw-r--r--src/config/accounts.c29
-rw-r--r--src/config/files.c73
-rw-r--r--src/config/files.h22
-rw-r--r--src/config/preferences.c29
-rw-r--r--src/config/scripts.c41
-rw-r--r--src/config/theme.c17
-rw-r--r--src/config/tlscerts.c18
7 files changed, 115 insertions, 114 deletions
diff --git a/src/config/accounts.c b/src/config/accounts.c
index d087bbb9..96168b5b 100644
--- a/src/config/accounts.c
+++ b/src/config/accounts.c
@@ -49,14 +49,13 @@
 #include "xmpp/xmpp.h"
 #include "xmpp/jid.h"
 
-static gchar *accounts_loc;
+static char *accounts_loc;
 static GKeyFile *accounts;
 
 static Autocomplete all_ac;
 static Autocomplete enabled_ac;
 
 static void _save_accounts(void);
-static gchar* _get_accounts_file(void);
 
 void
 accounts_load(void)
@@ -64,7 +63,7 @@ accounts_load(void)
     log_info("Loading accounts");
     all_ac = autocomplete_new();
     enabled_ac = autocomplete_new();
-    accounts_loc = _get_accounts_file();
+    accounts_loc = files_get_data_path(FILE_ACCOUNTS);
 
     if (g_file_test(accounts_loc, G_FILE_TEST_EXISTS)) {
         g_chmod(accounts_loc, S_IRUSR | S_IWUSR);
@@ -858,27 +857,13 @@ _save_accounts(void)
 {
     gsize g_data_size;
     gchar *g_accounts_data = g_key_file_to_data(accounts, &g_data_size, NULL);
-    gchar *xdg_data = files_get_xdg_data_home();
-    GString *base_str = g_string_new(xdg_data);
-    g_string_append(base_str, "/profanity/");
-    gchar *true_loc = get_file_or_linked(accounts_loc, base_str->str);
+
+    gchar *base = g_path_get_basename(accounts_loc);
+    gchar *true_loc = get_file_or_linked(accounts_loc, base);
     g_file_set_contents(true_loc, g_accounts_data, g_data_size, NULL);
     g_chmod(accounts_loc, S_IRUSR | S_IWUSR);
-    g_free(xdg_data);
+
+    g_free(base);
     free(true_loc);
     g_free(g_accounts_data);
-    g_string_free(base_str, TRUE);
-}
-
-static gchar*
-_get_accounts_file(void)
-{
-    gchar *xdg_data = files_get_xdg_data_home();
-    GString *logfile = g_string_new(xdg_data);
-    g_string_append(logfile, "/profanity/accounts");
-    gchar *result = strdup(logfile->str);
-    g_free(xdg_data);
-    g_string_free(logfile, TRUE);
-
-    return result;
 }
diff --git a/src/config/files.c b/src/config/files.c
index 7b8759b1..d60b4efa 100644
--- a/src/config/files.c
+++ b/src/config/files.c
@@ -35,18 +35,22 @@
 
 #include <stdlib.h>
 #include <string.h>
-
+#include <unistd.h>
 #include <glib.h>
 
 #include "common.h"
 #include "log.h"
 #include "config/files.h"
+#include "config/preferences.h"
+
+static char* _files_get_xdg_config_home(void);
+static char* _files_get_xdg_data_home(void);
 
 void
 files_create_directories(void)
 {
-    gchar *xdg_config = files_get_xdg_config_home();
-    gchar *xdg_data = files_get_xdg_data_home();
+    gchar *xdg_config = _files_get_xdg_config_home();
+    gchar *xdg_data = _files_get_xdg_data_home();
 
     GString *themes_dir = g_string_new(xdg_config);
     g_string_append(themes_dir, "/profanity/themes");
@@ -85,17 +89,17 @@ files_create_directories(void)
     g_free(xdg_data);
 }
 
-gchar*
-files_get_inputrc_path(void)
+char*
+files_get_inputrc_file(void)
 {
-    gchar *xdg_config = files_get_xdg_config_home();
+    gchar *xdg_config = _files_get_xdg_config_home();
     GString *inputrc_file = g_string_new(xdg_config);
     g_free(xdg_config);
 
     g_string_append(inputrc_file, "/profanity/inputrc");
 
     if (g_file_test(inputrc_file->str, G_FILE_TEST_IS_REGULAR)) {
-        gchar *result = strdup(inputrc_file->str);
+        char *result = strdup(inputrc_file->str);
         g_string_free(inputrc_file, TRUE);
 
         return result;
@@ -106,8 +110,53 @@ files_get_inputrc_path(void)
     return NULL;
 }
 
-gchar*
-files_get_xdg_config_home(void)
+char*
+files_get_log_file(void)
+{
+    gchar *xdg_data = _files_get_xdg_data_home();
+    GString *logfile = g_string_new(xdg_data);
+    g_string_append(logfile, "/profanity/logs/profanity");
+    if (!prefs_get_boolean(PREF_LOG_SHARED)) {
+        g_string_append_printf(logfile, "%d", getpid());
+    }
+    g_string_append(logfile, ".log");
+    char *result = strdup(logfile->str);
+    free(xdg_data);
+    g_string_free(logfile, TRUE);
+
+    return result;
+}
+
+char*
+files_get_config_path(char *config_base)
+{
+    gchar *xdg_config = _files_get_xdg_config_home();
+    GString *file_str = g_string_new(xdg_config);
+    g_string_append(file_str, "/profanity/");
+    g_string_append(file_str, config_base);
+    char *result = strdup(file_str->str);
+    g_free(xdg_config);
+    g_string_free(file_str, TRUE);
+
+    return result;
+}
+
+char*
+files_get_data_path(char *data_base)
+{
+    gchar *xdg_data = _files_get_xdg_data_home();
+    GString *file_str = g_string_new(xdg_data);
+    g_string_append(file_str, "/profanity/");
+    g_string_append(file_str, data_base);
+    char *result = strdup(file_str->str);
+    g_free(xdg_data);
+    g_string_free(file_str, TRUE);
+
+    return result;
+}
+
+static char*
+_files_get_xdg_config_home(void)
 {
     gchar *xdg_config_home = getenv("XDG_CONFIG_HOME");
     if (xdg_config_home)
@@ -118,15 +167,15 @@ files_get_xdg_config_home(void)
     } else {
         GString *default_path = g_string_new(getenv("HOME"));
         g_string_append(default_path, "/.config");
-        gchar *result = strdup(default_path->str);
+        char *result = strdup(default_path->str);
         g_string_free(default_path, TRUE);
 
         return result;
     }
 }
 
-gchar*
-files_get_xdg_data_home(void)
+static char*
+_files_get_xdg_data_home(void)
 {
     gchar *xdg_data_home = getenv("XDG_DATA_HOME");
     if (xdg_data_home)
diff --git a/src/config/files.h b/src/config/files.h
index ff50cc1d..47a73b43 100644
--- a/src/config/files.h
+++ b/src/config/files.h
@@ -37,11 +37,27 @@
 
 #include <glib.h>
 
+#define FILE_PROFRC "profrc"
+#define FILE_ACCOUNTS "accounts"
+#define FILE_TLSCERTS "tlscerts"
+#define FILE_PLUGIN_SETTINGS "plugin_settings"
+#define FILE_PLUGIN_THEMES "plugin_themes"
+#define FILE_CAPSCACHE "capscache"
+
+#define DIR_THEMES "themes"
+#define DIR_ICONS "icons"
+#define DIR_SCRIPTS "scripts"
+#define DIR_CHATLOGS "chatlogs"
+#define DIR_OTR "otr"
+#define DIR_PGP "pgp"
+#define DIR_PLUGINS "plugins"
+
 void files_create_directories(void);
 
-gchar* files_get_inputrc_path(void);
+char* files_get_config_path(char *config_base);
+char* files_get_data_path(char *data_base);
 
-gchar* files_get_xdg_config_home(void);
-gchar* files_get_xdg_data_home(void);
+char* files_get_log_file(void);
+char* files_get_inputrc_file(void);
 
 #endif
diff --git a/src/config/preferences.c b/src/config/preferences.c
index d2d3b8ce..bb9693fe 100644
--- a/src/config/preferences.c
+++ b/src/config/preferences.c
@@ -62,7 +62,7 @@
 
 #define INPBLOCK_DEFAULT 1000
 
-static gchar *prefs_loc;
+static char *prefs_loc;
 static GKeyFile *prefs;
 gint log_maxsize = 0;
 
@@ -70,7 +70,6 @@ static Autocomplete boolean_choice_ac;
 static Autocomplete room_trigger_ac;
 
 static void _save_prefs(void);
-static gchar* _get_preferences_file(void);
 static const char* _get_group(preference_t pref);
 static const char* _get_key(preference_t pref);
 static gboolean _get_default_boolean(preference_t pref);
@@ -80,7 +79,7 @@ void
 prefs_load(void)
 {
     GError *err;
-    prefs_loc = _get_preferences_file();
+    prefs_loc = files_get_config_path(FILE_PROFRC);
 
     if (g_file_test(prefs_loc, G_FILE_TEST_EXISTS)) {
         g_chmod(prefs_loc, S_IRUSR | S_IWUSR);
@@ -1140,29 +1139,15 @@ _save_prefs(void)
 {
     gsize g_data_size;
     gchar *g_prefs_data = g_key_file_to_data(prefs, &g_data_size, NULL);
-    gchar *xdg_config = files_get_xdg_config_home();
-    GString *base_str = g_string_new(xdg_config);
-    g_string_append(base_str, "/profanity/");
-    gchar *true_loc = get_file_or_linked(prefs_loc, base_str->str);
+    gchar *base = g_path_get_basename(prefs_loc);
+    gchar *true_loc = get_file_or_linked(prefs_loc, base);
+
     g_file_set_contents(true_loc, g_prefs_data, g_data_size, NULL);
     g_chmod(prefs_loc, S_IRUSR | S_IWUSR);
-    g_free(xdg_config);
+
+    g_free(base);
     free(true_loc);
     g_free(g_prefs_data);
-    g_string_free(base_str, TRUE);
-}
-
-static gchar*
-_get_preferences_file(void)
-{
-    gchar *xdg_config = files_get_xdg_config_home();
-    GString *prefs_file = g_string_new(xdg_config);
-    g_string_append(prefs_file, "/profanity/profrc");
-    gchar *result = strdup(prefs_file->str);
-    g_free(xdg_config);
-    g_string_free(prefs_file, TRUE);
-
-    return result;
 }
 
 // get the preference group for a specific preference
diff --git a/src/config/scripts.c b/src/config/scripts.c
index 8ab2684c..41f93e3c 100644
--- a/src/config/scripts.c
+++ b/src/config/scripts.c
@@ -51,38 +51,31 @@
 void
 scripts_init(void)
 {
-    gchar *data_home = files_get_xdg_data_home();
-    GString *scriptsdir = g_string_new(data_home);
-    free(data_home);
-
-    g_string_append(scriptsdir, "/profanity/scripts");
+    char *scriptsdir = files_get_data_path(DIR_SCRIPTS);
 
     // mkdir if doesn't exist
     errno = 0;
-    int res = g_mkdir_with_parents(scriptsdir->str, S_IRWXU);
+    int res = g_mkdir_with_parents(scriptsdir, S_IRWXU);
     if (res == -1) {
         char *errmsg = strerror(errno);
         if (errmsg) {
-            log_error("Error creating directory: %s, %s", scriptsdir->str, errmsg);
+            log_error("Error creating directory: %s, %s", scriptsdir, errmsg);
         } else {
-            log_error("Error creating directory: %s", scriptsdir->str);
+            log_error("Error creating directory: %s", scriptsdir);
         }
     }
 
-    g_string_free(scriptsdir, TRUE);
+    free(scriptsdir);
 }
 
 GSList*
 scripts_list(void)
 {
-    gchar *data_home = files_get_xdg_data_home();
-    GString *scriptsdir = g_string_new(data_home);
-    free(data_home);
-    g_string_append(scriptsdir, "/profanity/scripts");
+    char *scriptsdir = files_get_data_path(DIR_SCRIPTS);
 
     GSList *result = NULL;
-    GDir *scripts = g_dir_open(scriptsdir->str, 0, NULL);
-    g_string_free(scriptsdir, TRUE);
+    GDir *scripts = g_dir_open(scriptsdir, 0, NULL);
+    free(scriptsdir);
 
     if (scripts) {
         const gchar *script = g_dir_read_name(scripts);
@@ -99,11 +92,10 @@ scripts_list(void)
 GSList*
 scripts_read(const char *const script)
 {
-    gchar *data_home = files_get_xdg_data_home();
-    GString *scriptpath = g_string_new(data_home);
-    free(data_home);
-
-    g_string_append(scriptpath, "/profanity/scripts/");
+    char *scriptsdir = files_get_data_path(DIR_SCRIPTS);
+    GString *scriptpath = g_string_new(scriptsdir);
+    free(scriptsdir);
+    g_string_append(scriptpath, "/");
     g_string_append(scriptpath, script);
 
     FILE *scriptfile = g_fopen(scriptpath->str, "r");
@@ -137,11 +129,10 @@ scripts_read(const char *const script)
 gboolean
 scripts_exec(const char *const script)
 {
-    gchar *data_home = files_get_xdg_data_home();
-    GString *scriptpath = g_string_new(data_home);
-    free(data_home);
-
-    g_string_append(scriptpath, "/profanity/scripts/");
+    char *scriptsdir = files_get_data_path(DIR_SCRIPTS);
+    GString *scriptpath = g_string_new(scriptsdir);
+    free(scriptsdir);
+    g_string_append(scriptpath, "/");
     g_string_append(scriptpath, script);
 
     FILE *scriptfile = g_fopen(scriptpath->str, "r");
diff --git a/src/config/theme.c b/src/config/theme.c
index 55698ed6..0133b1f6 100644
--- a/src/config/theme.c
+++ b/src/config/theme.c
@@ -63,7 +63,6 @@ struct colour_string_t {
 };
 
 static void _load_preferences(void);
-static gchar* _get_themes_dir(void);
 void _theme_list_dir(const gchar *const dir, GSList **result);
 static GString* _theme_find(const char *const theme_name);
 static gboolean _theme_load_file(const char *const theme_name);
@@ -218,7 +217,7 @@ GSList*
 theme_list(void)
 {
     GSList *result = NULL;
-    char *themes_dir = _get_themes_dir();
+    char *themes_dir = files_get_config_path(DIR_THEMES);
     _theme_list_dir(themes_dir, &result);
     free(themes_dir);
 #ifdef THEMES_PATH
@@ -532,16 +531,6 @@ _load_preferences(void)
     }
 }
 
-static gchar*
-_get_themes_dir(void)
-{
-    gchar *xdg_config = files_get_xdg_config_home();
-    GString *themes_dir = g_string_new(xdg_config);
-    g_free(xdg_config);
-    g_string_append(themes_dir, "/profanity/themes");
-    return g_string_free(themes_dir, FALSE);
-}
-
 void
 _theme_list_dir(const gchar *const dir, GSList **result)
 {
@@ -560,11 +549,11 @@ static GString*
 _theme_find(const char *const theme_name)
 {
     GString *path = NULL;
-    gchar *themes_dir = _get_themes_dir();
+    char *themes_dir = files_get_config_path(DIR_THEMES);
 
     if (themes_dir) {
         path = g_string_new(themes_dir);
-        g_free(themes_dir);
+        free(themes_dir);
         g_string_append(path, "/");
         g_string_append(path, theme_name);
         if (!g_file_test(path->str, G_FILE_TEST_EXISTS)) {
diff --git a/src/config/tlscerts.c b/src/config/tlscerts.c
index 8a93ed51..edef2c8c 100644
--- a/src/config/tlscerts.c
+++ b/src/config/tlscerts.c
@@ -44,10 +44,9 @@
 #include "config/tlscerts.h"
 #include "tools/autocomplete.h"
 
-static gchar *tlscerts_loc;
+static char *tlscerts_loc;
 static GKeyFile *tlscerts;
 
-static gchar* _get_tlscerts_file(void);
 static void _save_tlscerts(void);
 
 static Autocomplete certs_ac;
@@ -58,7 +57,7 @@ void
 tlscerts_init(void)
 {
     log_info("Loading TLS certificates");
-    tlscerts_loc = _get_tlscerts_file();
+    tlscerts_loc = files_get_data_path(FILE_TLSCERTS);
 
     if (g_file_test(tlscerts_loc, G_FILE_TEST_EXISTS)) {
         g_chmod(tlscerts_loc, S_IRUSR | S_IWUSR);
@@ -429,19 +428,6 @@ tlscerts_close(void)
     autocomplete_free(certs_ac);
 }
 
-static gchar*
-_get_tlscerts_file(void)
-{
-    gchar *xdg_data = files_get_xdg_data_home();
-    GString *tlscerts_file = g_string_new(xdg_data);
-    g_string_append(tlscerts_file, "/profanity/tlscerts");
-    gchar *result = strdup(tlscerts_file->str);
-    g_free(xdg_data);
-    g_string_free(tlscerts_file, TRUE);
-
-    return result;
-}
-
 static void
 _save_tlscerts(void)
 {
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-09-20 02:40:23 +0000