more work on xml configuration setting..

1 files changed, 32 insertions, 69 deletions

diff --git a/src/config.c b/src/config.c
index 2456097..3731bcb 100644
--- a/src/config.c
+++ b/src/config.c
@@ -17,31 +17,12 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <gio/gio.h>
+#include "config.h"
 
 static GKeyFile *config;
 static int config_descr;
-
 static gchar *data_dir;
 
-/*static int hostnamed_ispect_xml_descr, hostnamed_dbus_xml_descr;
-static int localed_ispect_xml_descr, localed_dbus_xml_descr;
-static int timedated_ispect_xml_descr, timedated_dbus_xml_descr;
-static int logind_ispect_xml_descr, logind_dbus_xml_descr;
-
-/*TODO depending on builtin xml flag, these should be matched to checksums */    /*
-static gchar **hostnamed_ispect_xml, hostnamed_dbus_xml;
-static gchar **localed_ispect_xml, localed_dbus_xml;
-static gchar **timedated_ispect_xml, timedated_dbus_xml;
-static gchar **logind_ispect_xml, logind_dbus_xml; */
-
-static void set_xml_descriptors(); 
-
-static const gchar *CONFIG_KEYS[] = {
-    "PrettyHostname",
-    "IconName",
-    "ChassisType"
-};
-
 /* NULL if key doesn't exist */
 gchar *get_option(gchar *key, gchar *group) {
 
@@ -68,20 +49,19 @@ gboolean set_option(gchar *key, gchar *value, gchar *group) {
 /* initial load/check */
 gboolean config_init() {
 
-    if(config)
-        return TRUE; //already init'd
-
     config = g_key_file_new();
     
     const gchar *config_path;
     GStatBuf *config_lstat;
+	int config_lstat_ret;
 
     config_path = "/etc/systemd_compat.conf";
+	config_lstat_ret = g_lstat(config_path, config_lstat);
 
     /* does conf exist? */
-    if(g_lstat(config_path, config_lstat)) {
+    if(config_lstat_ret) {
 
-        /* if not, can we write it */
+        /* 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;
@@ -128,78 +108,61 @@ gboolean config_init() {
 
 gboolean init_xml() {
 
-	const gchar * const *data_dir_prefix;	
+	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);
-
-	GStatBuf *xml_lstat;
+	
+	xml_lstat_ret = g_lstat(data_dir, xml_lstat);
 
 	/* does xml dir exist? */
-	if(g_lstat(data_dir, xml_lstat)) {
+	if(xml_lstat_ret) {
 
-		/* if not, can we write it? */
+		/* 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)) {
+
+		if(g_mkdir(data_dir, 644) || g_access) {
 			g_printf("failed to create dir %s...\n", data_dir);
 			return FALSE;
 		}
 
-		set_xml_descriptors();
-	}
-	return TRUE; /* kill me! */
-} /* kill me too!*/
-
-//LEFTOFF
-		
-/*		gchar *posix_hostname;
-		posix_hostname = g_malloc(255); 
-
-		gethostname(posix_hostname, 255);
-
-		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
-
-		if(!g_key_file_save_to_file(config, config_path, NULL)) {
-			g_printf("failed to write config to %s!\n", config_path);
-			g_free(posix_hostname);
+		/* read in xml files from conf/ */
+		if(!read_xml_from_installconf()) {
+			g_printf("failed to read xml configs in conf/...\n");
 			return FALSE;
 		}
 
-		g_printf("wrote config to %s\n", config_path);
+		/* 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;
+		}
 
-		g_free(posix_hostname);
+		/* 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 */     /*
+	
+	/* it does exist, read it */
 	} else {
 
-		if(!g_access(config_path, W_OK)) {
-			g_printf("%s\n", "no write permissions for /etc/! exiting..");
+		if(!set_xml_descriptors()) {
+			g_printf("failed to fopen xml configs...\n");
 			return FALSE;
-		} else if(g_key_file_load_from_file(config, config_path, G_KEY_FILE_KEEP_COMMENTS, NULL)) {
-			config_descr = g_open(config_path, O_RDWR, 644);
-			return TRUE;
 		}
 
-		g_printf("could not read config at %s! exiting..", config_path);
-		return FALSE;
+		return TRUE;
 	}
-
-
-	return TRUE;
-} */
-
-static void set_xml_descriptors() {
-	
 }
 
 void clean_config() {