Add config/files.c

Makefile.am

@@ -40,6 +40,7 @@ core_sources = \
 	src/tools/p_sha1.h src/tools/p_sha1.c \
 	src/tools/autocomplete.c src/tools/autocomplete.h \
 	src/tools/tinyurl.c src/tools/tinyurl.h \
+	src/config/files.c src/config/files.h \
 	src/config/conflists.c src/config/conflists.h \
 	src/config/accounts.c src/config/accounts.h \
 	src/config/tlscerts.c src/config/tlscerts.h \
@@ -78,6 +79,7 @@ unittest_sources = \
 	src/tools/tinyurl.c src/tools/tinyurl.h \
 	src/config/accounts.h \
 	src/config/account.c src/config/account.h \
+	src/config/files.c src/config/files.h \
 	src/config/tlscerts.c src/config/tlscerts.h \
 	src/config/preferences.c src/config/preferences.h \
 	src/config/theme.c src/config/theme.h \

src/common.c

@@ -449,44 +449,6 @@ contact_presence_from_resource_presence(resource_presence_t resource_presence)
     }
 }
 
-gchar*
-xdg_get_config_home(void)
-{
-    gchar *xdg_config_home = getenv("XDG_CONFIG_HOME");
-    if (xdg_config_home)
-        g_strstrip(xdg_config_home);
-
-    if (xdg_config_home && (strcmp(xdg_config_home, "") != 0)) {
-        return strdup(xdg_config_home);
-    } else {
-        GString *default_path = g_string_new(getenv("HOME"));
-        g_string_append(default_path, "/.config");
-        gchar *result = strdup(default_path->str);
-        g_string_free(default_path, TRUE);
-
-        return result;
-    }
-}
-
-gchar*
-xdg_get_data_home(void)
-{
-    gchar *xdg_data_home = getenv("XDG_DATA_HOME");
-    if (xdg_data_home)
-        g_strstrip(xdg_data_home);
-
-    if (xdg_data_home && (strcmp(xdg_data_home, "") != 0)) {
-        return strdup(xdg_data_home);
-    } else {
-        GString *default_path = g_string_new(getenv("HOME"));
-        g_string_append(default_path, "/.local/share");
-        gchar *result = strdup(default_path->str);
-        g_string_free(default_path, TRUE);
-
-        return result;
-    }
-}
-
 char*
 create_unique_id(char *prefix)
 {

src/common.h

@@ -110,8 +110,6 @@ int utf8_display_len(const char *const str);
 char* prof_getline(FILE *stream);
 char* release_get_latest(void);
 gboolean release_is_new(char *found_version);
-gchar* xdg_get_config_home(void);
-gchar* xdg_get_data_home(void);
 
 gboolean valid_resource_presence_string(const char *const str);
 const char* string_from_resource_presence(resource_presence_t presence);

src/config/accounts.c

@@ -42,6 +42,7 @@
 
 #include "common.h"
 #include "log.h"
+#include "config/files.h"
 #include "config/account.h"
 #include "config/conflists.h"
 #include "tools/autocomplete.h"

src/config/files.c

@@ -0,0 +1,124 @@
+/*
+ * files.c
+ *
+ * Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
+ *
+ * This file is part of Profanity.
+ *
+ * Profanity is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Profanity is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link the code of portions of this program with the OpenSSL library under
+ * certain conditions as described in each individual source file, and
+ * distribute linked combinations including the two.
+ *
+ * You must obey the GNU General Public License in all respects for all of the
+ * code used other than OpenSSL. If you modify file(s) with this exception, you
+ * may extend this exception to your version of the file(s), but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version. If you delete this exception statement from all
+ * source files in the program, then also delete it here.
+ *
+ */
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <glib.h>
+
+#include "common.h"
+#include "log.h"
+#include "config/files.h"
+
+void
+files_create_directories(void)
+{
+    gchar *xdg_config = xdg_get_config_home();
+    gchar *xdg_data = xdg_get_data_home();
+
+    GString *themes_dir = g_string_new(xdg_config);
+    g_string_append(themes_dir, "/profanity/themes");
+    GString *icons_dir = g_string_new(xdg_config);
+    g_string_append(icons_dir, "/profanity/icons");
+    GString *chatlogs_dir = g_string_new(xdg_data);
+    g_string_append(chatlogs_dir, "/profanity/chatlogs");
+    GString *logs_dir = g_string_new(xdg_data);
+    g_string_append(logs_dir, "/profanity/logs");
+    GString *plugins_dir = g_string_new(xdg_data);
+    g_string_append(plugins_dir, "/profanity/plugins");
+
+    if (!mkdir_recursive(themes_dir->str)) {
+        log_error("Error while creating directory %s", themes_dir->str);
+    }
+    if (!mkdir_recursive(icons_dir->str)) {
+        log_error("Error while creating directory %s", icons_dir->str);
+    }
+    if (!mkdir_recursive(chatlogs_dir->str)) {
+        log_error("Error while creating directory %s", chatlogs_dir->str);
+    }
+    if (!mkdir_recursive(logs_dir->str)) {
+        log_error("Error while creating directory %s", logs_dir->str);
+    }
+    if (!mkdir_recursive(plugins_dir->str)) {
+        log_error("Error while creating directory %s", plugins_dir->str);
+    }
+
+    g_string_free(themes_dir, TRUE);
+    g_string_free(icons_dir, TRUE);
+    g_string_free(chatlogs_dir, TRUE);
+    g_string_free(logs_dir, TRUE);
+    g_string_free(plugins_dir, TRUE);
+
+    g_free(xdg_config);
+    g_free(xdg_data);
+}
+
+gchar*
+xdg_get_config_home(void)
+{
+    gchar *xdg_config_home = getenv("XDG_CONFIG_HOME");
+    if (xdg_config_home)
+        g_strstrip(xdg_config_home);
+
+    if (xdg_config_home && (strcmp(xdg_config_home, "") != 0)) {
+        return strdup(xdg_config_home);
+    } else {
+        GString *default_path = g_string_new(getenv("HOME"));
+        g_string_append(default_path, "/.config");
+        gchar *result = strdup(default_path->str);
+        g_string_free(default_path, TRUE);
+
+        return result;
+    }
+}
+
+gchar*
+xdg_get_data_home(void)
+{
+    gchar *xdg_data_home = getenv("XDG_DATA_HOME");
+    if (xdg_data_home)
+        g_strstrip(xdg_data_home);
+
+    if (xdg_data_home && (strcmp(xdg_data_home, "") != 0)) {
+        return strdup(xdg_data_home);
+    } else {
+        GString *default_path = g_string_new(getenv("HOME"));
+        g_string_append(default_path, "/.local/share");
+        gchar *result = strdup(default_path->str);
+        g_string_free(default_path, TRUE);
+
+        return result;
+    }
+}

src/config/files.h

@@ -0,0 +1,44 @@
+/*
+ * files.h
+ *
+ * Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
+ *
+ * This file is part of Profanity.
+ *
+ * Profanity is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Profanity is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link the code of portions of this program with the OpenSSL library under
+ * certain conditions as described in each individual source file, and
+ * distribute linked combinations including the two.
+ *
+ * You must obey the GNU General Public License in all respects for all of the
+ * code used other than OpenSSL. If you modify file(s) with this exception, you
+ * may extend this exception to your version of the file(s), but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version. If you delete this exception statement from all
+ * source files in the program, then also delete it here.
+ *
+ */
+
+#ifndef CONFIG_FILES_H
+#define CONFIG_FILES_H
+
+#include <glib.h>
+
+gchar* xdg_get_config_home(void);
+gchar* xdg_get_data_home(void);
+void files_create_directories(void);
+
+#endif

src/config/preferences.c

@@ -45,6 +45,7 @@
 #include "log.h"
 #include "preferences.h"
 #include "tools/autocomplete.h"
+#include "config/files.h"
 #include "config/conflists.h"
 
 // preference groups refer to the sections in .profrc, for example [ui]

src/config/scripts.c

@@ -42,6 +42,7 @@
 
 #include "common.h"
 #include "log.h"
+#include "config/files.h"
 #include "command/cmd_defs.h"
 #include "ui/ui.h"
 #include "ui/window_list.h"

src/config/theme.c

@@ -47,8 +47,9 @@
 
 #include "common.h"
 #include "log.h"
-#include "theme.h"
-#include "preferences.h"
+#include "config/files.h"
+#include "config/theme.h"
+#include "config/preferences.h"
 
 static GString *theme_loc;
 static GKeyFile *theme;

src/config/tlscerts.c

@@ -40,6 +40,7 @@
 
 #include "log.h"
 #include "common.h"
+#include "config/files.h"
 #include "config/tlscerts.h"
 #include "tools/autocomplete.h"
 

src/log.c

@@ -45,6 +45,7 @@
 
 #include "log.h"
 #include "common.h"
+#include "config/files.h"
 #include "config/preferences.h"
 #include "xmpp/xmpp.h"
 

src/otr/otr.c

@@ -40,6 +40,7 @@
 
 #include "log.h"
 #include "config/preferences.h"
+#include "config/files.h"
 #include "otr/otr.h"
 #include "otr/otrlib.h"
 #include "ui/ui.h"

src/pgp/gpg.c

@@ -47,6 +47,7 @@
 #include "log.h"
 #include "common.h"
 #include "pgp/gpg.h"
+#include "config/files.h"
 #include "tools/autocomplete.h"
 #include "ui/ui.h"
 

src/plugins/plugins.c

@@ -38,6 +38,7 @@
 #include "log.h"
 #include "config.h"
 #include "common.h"
+#include "config/files.h"
 #include "config/preferences.h"
 #include "plugins/callbacks.h"
 #include "plugins/autocompleters.h"

src/plugins/settings.c

@@ -40,6 +40,7 @@
 
 #include "common.h"
 #include "config/theme.h"
+#include "config/files.h"
 
 static GKeyFile *settings;
 

src/plugins/themes.c

@@ -37,6 +37,7 @@
 
 #include "common.h"
 #include "config/theme.h"
+#include "config/files.h"
 
 static GKeyFile *themes;
 

src/profanity.c

@@ -51,6 +51,7 @@
 #include "profanity.h"
 #include "common.h"
 #include "log.h"
+#include "config/files.h"
 #include "config/tlscerts.h"
 #include "config/accounts.h"
 #include "config/preferences.h"
@@ -81,7 +82,6 @@
 
 static void _init(char *log_level);
 static void _shutdown(void);
-static void _create_directories(void);
 static void _connect_default(const char * const account);
 
 static gboolean cont = TRUE;
@@ -164,7 +164,7 @@ _init(char *log_level)
         exit(1);
     }
     pthread_mutex_lock(&lock);
-    _create_directories();
+    files_create_directories();
     log_level_t prof_log_level = log_level_from_string(log_level);
     prefs_load();
     log_init(prof_log_level);
@@ -244,46 +244,3 @@ _shutdown(void)
     ui_close();
     prefs_close();
 }
-
-static void
-_create_directories(void)
-{
-    gchar *xdg_config = xdg_get_config_home();
-    gchar *xdg_data = xdg_get_data_home();
-
-    GString *themes_dir = g_string_new(xdg_config);
-    g_string_append(themes_dir, "/profanity/themes");
-    GString *icons_dir = g_string_new(xdg_config);
-    g_string_append(icons_dir, "/profanity/icons");
-    GString *chatlogs_dir = g_string_new(xdg_data);
-    g_string_append(chatlogs_dir, "/profanity/chatlogs");
-    GString *logs_dir = g_string_new(xdg_data);
-    g_string_append(logs_dir, "/profanity/logs");
-    GString *plugins_dir = g_string_new(xdg_data);
-    g_string_append(plugins_dir, "/profanity/plugins");
-
-    if (!mkdir_recursive(themes_dir->str)) {
-        log_error("Error while creating directory %s", themes_dir->str);
-    }
-    if (!mkdir_recursive(icons_dir->str)) {
-        log_error("Error while creating directory %s", icons_dir->str);
-    }
-    if (!mkdir_recursive(chatlogs_dir->str)) {
-        log_error("Error while creating directory %s", chatlogs_dir->str);
-    }
-    if (!mkdir_recursive(logs_dir->str)) {
-        log_error("Error while creating directory %s", logs_dir->str);
-    }
-    if (!mkdir_recursive(plugins_dir->str)) {
-        log_error("Error while creating directory %s", plugins_dir->str);
-    }
-
-    g_string_free(themes_dir, TRUE);
-    g_string_free(icons_dir, TRUE);
-    g_string_free(chatlogs_dir, TRUE);
-    g_string_free(logs_dir, TRUE);
-    g_string_free(plugins_dir, TRUE);
-
-    g_free(xdg_config);
-    g_free(xdg_data);
-}

src/ui/tray.c

@@ -41,6 +41,7 @@
 
 #include "log.h"
 #include "config/preferences.h"
+#include "config/files.h"
 #include "ui/tray.h"
 #include "ui/window_list.h"
 

src/xmpp/capabilities.c

@@ -55,6 +55,7 @@
 #include "common.h"
 #include "log.h"
 #include "plugins/plugins.h"
+#include "config/files.h"
 #include "xmpp/xmpp.h"
 #include "xmpp/stanza.h"
 #include "xmpp/form.h"