From a8990014e22f4735890a3473aab87a05245a9822 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Fri, 11 Dec 2020 10:40:10 +0100 Subject: Use whole path as logfile when defined via -f `profanity -f my` created ~/.local/share/profanity/logs/my.log`. It would be nicer if one could define the actual path, so one can choose another directory or even use /dev/null. Fixes https://github.com/profanity-im/profanity/issues/1442 --- src/config/files.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/config/files.c b/src/config/files.c index 72b192e4..b6a8d490 100644 --- a/src/config/files.c +++ b/src/config/files.c @@ -116,20 +116,26 @@ char* files_get_log_file(const char* const log_file) { gchar* xdg_data = _files_get_xdg_data_home(); - GString* logfile = g_string_new(xdg_data); + GString* logfile; if (log_file) { - g_string_append(logfile, "/profanity/logs/"); - g_string_append(logfile, log_file); + gchar *log_path = g_path_get_dirname(log_file); + if (!mkdir_recursive(log_path)) { + log_error("Error while creating directory %s", log_path); + } + g_free(log_path); + + logfile = g_string_new(log_file); } else { + 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()); - } + if (!prefs_get_boolean(PREF_LOG_SHARED)) { + g_string_append_printf(logfile, "%d", getpid()); + } - g_string_append(logfile, ".log"); + g_string_append(logfile, ".log"); + } char* result = g_strdup(logfile->str); -- cgit 1.4.1-2-gfad0