From: kremlin <ian@kremlin.cc>
Date: Thu, 26 Jun 2014 06:30:17 +0000 (-0500)
Subject: clean up config.c
X-Git-Tag: gsoc-final~116
X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=commitdiff_plain;h=7f67c06978732bc0c623f5688f31f32f2ed6b005

clean up config.c
---

diff --git a/src/config.c b/src/config.c
index 3731bcb..5cbecb1 100644
--- a/src/config.c
+++ b/src/config.c
@@ -49,14 +49,18 @@ gboolean set_option(gchar *key, gchar *value, gchar *group) {
 /* initial load/check */
 gboolean config_init() {
 
+    /* config is already set */
+    if(config)
+        return TRUE;
+    
     config = g_key_file_new();
     
     const gchar *config_path;
     GStatBuf *config_lstat;
-	int config_lstat_ret;
+    int config_lstat_ret;
 
     config_path = "/etc/systemd_compat.conf";
-	config_lstat_ret = g_lstat(config_path, config_lstat);
+    config_lstat_ret = g_lstat(config_path, config_lstat);
 
     /* does conf exist? */
     if(config_lstat_ret) {
@@ -67,7 +71,7 @@ gboolean config_init() {
             return FALSE;
         }
 
-        int config_descr;
+        int config_descr; /*TODO add to descr array for sigints, etc */
         config_descr = g_open(config_path, O_CREAT, 644);
 
         gchar *posix_hostname;
@@ -78,7 +82,7 @@ gboolean config_init() {
         g_key_file_set_string(config, "hostnamed", "Hostname", posix_hostname);
         g_key_file_set_string(config, "hostnamed", "PrettyHostname", "");
         g_key_file_set_string(config, "hostnamed", "IconName", "Computer"); 
-        g_key_file_set_string(config, "hostnamed", "ChassisType", "laptop"); //TODO set these correctly
+        g_key_file_set_string(config, "hostnamed", "ChassisType","laptop"); /*TODO set these correctly */
 
         if(!g_key_file_save_to_file(config, config_path, NULL)) {
             g_printf("failed to write config to %s!\n", config_path);
@@ -108,67 +112,67 @@ gboolean config_init() {
 
 gboolean init_xml() {
 
-	const gchar * const *data_dir_prefix;
-	int xml_lstat_ret;
-	GStatBuf *xml_lstat;
-
-	data_dir_prefix = g_get_system_data_dirs();
-	data_dir = g_strconcat(data_dir_prefix[0], "systemd_compat", NULL);
-	
-	xml_lstat_ret = g_lstat(data_dir, xml_lstat);
-
-	/* does xml dir exist? */
-	if(xml_lstat_ret) {
-
-		/* if not, can we write to where it should be? */
-		if(g_access(data_dir_prefix[0], W_OK)) {
-			g_printf("no write permissions for %s! exiting...\n", data_dir_prefix[0]);
-			return FALSE;
-		}
-
-		g_printf("creating xml data directory %s...\n", data_dir);
-
-		if(g_mkdir(data_dir, 644) || g_access) {
-			g_printf("failed to create dir %s...\n", data_dir);
-			return FALSE;
-		}
-
-		/* read in xml files from conf/ */
-		if(!read_xml_from_installconf()) {
-			g_printf("failed to read xml configs in conf/...\n");
-			return FALSE;
-		}
-
-		/* write our configs to system data dir */
-		if(!populate_xml_data_dir()) {
-			g_printf("failed to write xml configs to %s...\n", data_dir);
-			return FALSE;
-		}
-
-		/* get descriptors from freshly-installed configs */
-		if(!set_xml_descriptors()) {
-			g_printf("failed to fopen xml configs...\n");
-			return FALSE;
-		}
-
-		return TRUE;
-	
-	/* it does exist, read it */
-	} else {
-
-		if(!set_xml_descriptors()) {
-			g_printf("failed to fopen xml configs...\n");
-			return FALSE;
-		}
-
-		return TRUE;
-	}
+    const gchar * const *data_dir_prefix;
+    int xml_lstat_ret;
+    GStatBuf *xml_lstat;
+
+    data_dir_prefix = g_get_system_data_dirs();
+    data_dir = g_strconcat(data_dir_prefix[0], "systemd_compat", NULL);
+    
+    xml_lstat_ret = g_lstat(data_dir, xml_lstat);
+
+    /* does xml dir exist? */
+    if(xml_lstat_ret) {
+
+        /* if not, can we write to where it should be? */
+        if(g_access(data_dir_prefix[0], W_OK)) {
+            g_printf("no write permissions for %s! exiting...\n", data_dir_prefix[0]);
+            return FALSE;
+        }
+
+        g_printf("creating xml data directory %s...\n", data_dir);
+
+        if(g_mkdir(data_dir, 644) || g_access) {
+            g_printf("failed to create dir %s...\n", data_dir);
+            return FALSE;
+        }
+
+        /* read in xml files from conf/ */
+        if(!read_xml_from_installconf()) {
+            g_printf("failed to read xml configs in conf/...\n");
+            return FALSE;
+        }
+
+        /* write our configs to system data dir */
+        if(!populate_xml_data_dir()) {
+            g_printf("failed to write xml configs to %s...\n", data_dir);
+            return FALSE;
+        }
+
+        /* get descriptors from freshly-installed configs */
+        if(!set_xml_descriptors()) {
+            g_printf("failed to fopen xml configs...\n");
+            return FALSE;
+        }
+
+        return TRUE;
+    
+    /* it does exist, read it */
+    } else {
+
+        if(!set_xml_descriptors()) {
+            g_printf("failed to fopen xml configs...\n");
+            return FALSE;
+        }
+
+        return TRUE;
+    }
 }
 
 void clean_config() {
 
-	//TODO g_ptr_array all of this
-	g_free(config);
-	g_free(data_dir);
-	g_close(config_descr, NULL);
+    //TODO g_ptr_array all of this
+    g_free(config);
+    g_free(data_dir);
+    g_close(config_descr, NULL);
 }