X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Fconfig.c;h=480bcf6fe8ab17c4ea8f4d34dc5ae60808a3f6d1;hb=a6f11205f4da65a5671707d396df40203f668e1c;hp=3731bcb4826a83910e349add8d37c2bd0823a09a;hpb=d90aa67d8dbd325da6a1f42a915cfa8724c5cd27;p=systembsd.git

diff --git a/src/config.c b/src/config.c
index 3731bcb..480bcf6 100644
--- a/src/config.c
+++ b/src/config.c
@@ -41,7 +41,7 @@ gboolean set_option(gchar *key, gchar *value, gchar *group) {
     if(!g_key_file_get_string(config, group, key, NULL))
         return FALSE;
 
-    //TODO safteycheck value
+    /* TODO safteycheck value */
     g_key_file_set_string(config, group, key, value);
     return TRUE;
 }
@@ -49,25 +49,29 @@ 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? */
+	/* this should all be handled in the makefile
+     * does conf exist?
     if(config_lstat_ret) {
 
-        /* if not, can we write to where it should be? */
         if(g_access("/etc/", W_OK)) {
             g_printf("%s\n", "no write permissions for /etc/! exiting..");
             return FALSE;
         }
 
-        int config_descr;
+        int config_descr; 
         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"); 
 
         if(!g_key_file_save_to_file(config, config_path, NULL)) {
             g_printf("failed to write config to %s!\n", config_path);
@@ -90,85 +94,79 @@ gboolean config_init() {
 
         g_free(posix_hostname);
 
-        return TRUE;
+        return TRUE; 
 
-    /* it does exist, read it */
-    } else {
+    } else { */
 
-        if(g_access(config_path, W_OK)) {
-            g_printf("%s\n", "no write permissions for /etc/! exiting..");
-            return FALSE;
-        } else if(g_key_file_load_from_file(config, config_path, G_KEY_FILE_KEEP_COMMENTS, NULL))
-            return TRUE;
+    if(g_access(config_path, W_OK)) {
 
-        g_printf("could not read config at %s! exiting..", config_path);
+		g_printf("%s\n", "no write permissions for /etc/! exiting..");
         return FALSE;
-    }
-}
 
-gboolean init_xml() {
+    } else if(g_key_file_load_from_file(config, config_path, G_KEY_FILE_KEEP_COMMENTS, NULL))
+        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;
-	}
+    g_printf("could not read config at %s! exiting..", config_path);
+    return FALSE;
 }
+/* this definitely does not need to exist
+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);
+
+    if(xml_lstat_ret) {
+
+        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;
+        }
+
+        if(!read_xml_from_installconf()) {
+            g_printf("failed to read xml configs in conf/...\n");
+            return FALSE;
+        }
+
+        if(!populate_xml_data_dir()) {
+            g_printf("failed to write xml configs to %s...\n", data_dir);
+            return FALSE;
+        }
+
+        if(!set_xml_descriptors()) {
+            g_printf("failed to fopen xml configs...\n");
+            return FALSE;
+        }
+
+        return TRUE;
+    
+    } 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);
 }