From 30e4786180047d6b8fc97ee3c4e18b62f8b0d6b0 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sun, 2 Dec 2012 01:01:27 +0000
Subject: Create logs dir for main log

---
 src/files.c     | 108 +++++++++++++++++++++++++++++++++++---------------------
 src/files.h     |   5 +--
 src/profanity.c |   5 +--
 3 files changed, 69 insertions(+), 49 deletions(-)

diff --git a/src/files.c b/src/files.c
index 34d0c98c..96480b3d 100644
--- a/src/files.c
+++ b/src/files.c
@@ -29,51 +29,22 @@
 
 #include <glib.h>
 
+static void _files_create_config_directory(void);
+static void _files_create_data_directory(void);
+static void _files_create_chatlog_directory(void);
+static void _files_create_log_directory(void);
+static void _files_create_themes_directory(void);
 static void _create_dir(char *name);
 static void _mkdir_recursive(const char *dir);
 
 void
-files_create_config_directory(void)
+files_create_directories(void)
 {
-    gchar *xdg_config = xdg_get_config_home();
-    GString *prof_conf_dir = g_string_new(xdg_config);
-    g_string_append(prof_conf_dir, "/profanity");
-    _mkdir_recursive(prof_conf_dir->str);
-    g_free(xdg_config);
-    g_string_free(prof_conf_dir, TRUE);
-}
-
-void
-files_create_data_directory(void)
-{
-    gchar *xdg_data = xdg_get_data_home();
-    GString *prof_data_dir = g_string_new(xdg_data);
-    g_string_append(prof_data_dir, "/profanity");
-    _mkdir_recursive(prof_data_dir->str);
-    g_free(xdg_data);
-    g_string_free(prof_data_dir, TRUE);
-}
-
-void
-files_create_chatlog_directory(void)
-{
-    gchar *xdg_data = xdg_get_data_home();
-    GString *chatlogs_dir = g_string_new(xdg_data);
-    g_string_append(chatlogs_dir, "/profanity/chatlogs");
-    _mkdir_recursive(chatlogs_dir->str);
-    g_free(xdg_data);
-    g_string_free(chatlogs_dir, TRUE);
-}
-
-void
-files_create_themes_directory(void)
-{
-    gchar *xdg_config = xdg_get_config_home();
-    GString *themes_dir = g_string_new(xdg_config);
-    g_string_append(themes_dir, "/profanity/themes");
-    _mkdir_recursive(themes_dir->str);
-    g_free(xdg_config);
-    g_string_free(themes_dir, TRUE);
+    _files_create_config_directory();
+    _files_create_data_directory();
+    _files_create_chatlog_directory();
+    _files_create_log_directory();
+    _files_create_themes_directory();
 }
 
 gchar *
@@ -107,7 +78,7 @@ files_get_log_file(void)
 {
     gchar *xdg_data = xdg_get_data_home();
     GString *logfile = g_string_new(xdg_data);
-    g_string_append(logfile, "/profanity/profanity.log");
+    g_string_append(logfile, "/profanity/logs/profanity.log");
     gchar *result = strdup(logfile->str);
     g_free(xdg_data);
     g_string_free(logfile, TRUE);
@@ -128,6 +99,61 @@ files_get_themes_dir(void)
     return result;
 }
 
+static void
+_files_create_config_directory(void)
+{
+    gchar *xdg_config = xdg_get_config_home();
+    GString *prof_conf_dir = g_string_new(xdg_config);
+    g_string_append(prof_conf_dir, "/profanity");
+    _mkdir_recursive(prof_conf_dir->str);
+    g_free(xdg_config);
+    g_string_free(prof_conf_dir, TRUE);
+}
+
+static void
+_files_create_data_directory(void)
+{
+    gchar *xdg_data = xdg_get_data_home();
+    GString *prof_data_dir = g_string_new(xdg_data);
+    g_string_append(prof_data_dir, "/profanity");
+    _mkdir_recursive(prof_data_dir->str);
+    g_free(xdg_data);
+    g_string_free(prof_data_dir, TRUE);
+}
+
+static void
+_files_create_chatlog_directory(void)
+{
+    gchar *xdg_data = xdg_get_data_home();
+    GString *chatlogs_dir = g_string_new(xdg_data);
+    g_string_append(chatlogs_dir, "/profanity/chatlogs");
+    _mkdir_recursive(chatlogs_dir->str);
+    g_free(xdg_data);
+    g_string_free(chatlogs_dir, TRUE);
+}
+
+static void
+_files_create_log_directory(void)
+{
+    gchar *xdg_data = xdg_get_data_home();
+    GString *chatlogs_dir = g_string_new(xdg_data);
+    g_string_append(chatlogs_dir, "/profanity/logs");
+    _mkdir_recursive(chatlogs_dir->str);
+    g_free(xdg_data);
+    g_string_free(chatlogs_dir, TRUE);
+}
+
+static void
+_files_create_themes_directory(void)
+{
+    gchar *xdg_config = xdg_get_config_home();
+    GString *themes_dir = g_string_new(xdg_config);
+    g_string_append(themes_dir, "/profanity/themes");
+    _mkdir_recursive(themes_dir->str);
+    g_free(xdg_config);
+    g_string_free(themes_dir, TRUE);
+}
+
 static void
 _create_dir(char *name)
 {
diff --git a/src/files.h b/src/files.h
index 694ec0e1..ade7075b 100644
--- a/src/files.h
+++ b/src/files.h
@@ -23,10 +23,7 @@
 #ifndef FILES_H
 #define FILES_H
 
-void files_create_config_directory(void);
-void files_create_data_directory(void);
-void files_create_chatlog_directory(void);
-void files_create_themes_directory(void);
+void files_create_directories(void);
 gchar* files_get_chatlog_dir(void);
 gchar* files_get_preferences_file(void);
 gchar* files_get_log_file(void);
diff --git a/src/profanity.c b/src/profanity.c
index 8a7c5fd0..8f4befb1 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -502,10 +502,7 @@ _init(const int disable_tls, char *log_level)
 {
     // ignore SIGPIPE
     signal(SIGPIPE, SIG_IGN);
-    files_create_config_directory();
-    files_create_data_directory();
-    files_create_chatlog_directory();
-    files_create_themes_directory();
+    files_create_directories();
     log_level_t prof_log_level = _get_log_level(log_level);
     log_init(prof_log_level);
     log_info("Starting Profanity (%s)...", PACKAGE_VERSION);
-- 
cgit 1.4.1-2-gfad0