fixing merge conflicts

diff --git a/src/config.c b/src/config.c
index 3c20820d9b7d08cd31aa8ba5005d2c86c858b21e..54003faaed3e018e75362ebc3af09f49423ee9d6 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -23,16 +23,16 @@ static int config_descr;
 
 static gchar *data_dir;
 
-static int hostnamed_ispect_xml_descr, hostnamed_dbus_xml_descr;
+/*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 */
+/*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 gchar **logind_ispect_xml, logind_dbus_xml; */
 
 static const gchar *CONFIG_KEYS[] = {
     "PrettyHostname",
@@ -122,5 +122,87 @@ gboolean config_init() {
         g_printf("could not read config at %s! exiting..", config_path);
         return FALSE;
     }
+
+gboolean init_xml() {
+
+       const gchar * const *data_dir_prefix;   
+
+       data_dir_prefix = g_get_system_data_dirs();
+       data_dir = g_strconcat(data_dir_prefix[0], "systemd_compat", NULL);
+
+       GStatBuf *xml_lstat;
+
+       /* does xml dir exist? */
+       if(g_lstat(data_dir, xml_lstat)) {
+
+               /* if not, can we write it? */
+               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_printf("failed to create dir %s...\n", data_dir);
+                       return FALSE;
+               }
+
+               //set_xml_descriptors();
+               return TRUE; //kill me!
+       }
 }
 }
+//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);
+                       return FALSE;
+               }
+
+               g_printf("wrote config to %s\n", config_path);
+
+               g_free(posix_hostname);
+
+               return TRUE;
+
+       /* it does exist, read it */     /*
+       } 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)) {
+                       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;
+} */
+
+/*static void set_xml_descriptors() {
+       
+}
+
+void clean_config() {
+
+       //TODO g_ptr_array all of this
+       g_free(config);
+       g_free(data_dir);
+       g_close(config_descr, NULL);
+}*/

diff --git a/src/main.c b/src/main.c
index fc50a2445cdd8bc547163381d62f59c52ea7f6ab..da8cdc68333c80aea24f55ce82985edae9d2037b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -28,7 +28,6 @@
 //#include "main/h"
 
 gboolean systemd_utils_init() {
-<<<<<<< HEAD
        #ifdef INSTALL
                if(!config_init()) {
                        gchar *tmp;
@@ -37,24 +36,15 @@ gboolean systemd_utils_init() {
                        g_printf("FAILED to install configs in %s!\n", tmp);
                        return FALSE;
                } 
-               if(!init_xml()) {
+               /*if(!init_xml()) {
                        gchar **tmp;
                        tmp = g_get_system_data_dirs();
 
                        g_printf("FAILED to install xml configs in %s!\n", tmp[0]);
                        return FALSE;
-               }
+               }*/
        #endif
        return TRUE;
-=======
-    #ifdef INSTALL
-        if(!config_init()) {
-            g_printf("%s\n", "FAILED to install configs in /etc/!");
-            return FALSE; 
-        }
-    #endif
-    return TRUE;
->>>>>>> master
 }
 
 int main() {