fix up merge conflicts to compile on strict settings
[systembsd.git] / src / config.c
index f76b42039997b056373f0b6cc7dcff1563eff4a6..2d761065b961ff5e9ad4b4494d2b2c2ebe54d85b 100644 (file)
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2014 Ian Sutton <ian@kremlin.cc>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
 #include <unistd.h>
 #include <fcntl.h>
 #include <gio/gio.h>
@@ -7,111 +23,110 @@ 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",
-       "IconName",
-       "ChassisType"
+    "PrettyHostname",
+    "IconName",
+    "ChassisType"
 };
 
 /* NULL if key doesn't exist */
 gchar *get_option(gchar *key, gchar *group) {
 
-       if(!group)
-               group = "default";
+    if(!group)
+        group = "default";
 
-       return g_key_file_get_string(config, group, key, NULL);
+    return g_key_file_get_string(config, group, key, NULL);
 }
 
 /* false if key isn't already defined or value is invalid */
 gboolean set_option(gchar *key, gchar *value, gchar *group) {
 
-       if(!group)
-               group = "default";
+    if(!group)
+        group = "default";
 
-       if(!g_key_file_get_string(config, group, key, NULL))
-               return FALSE;
+    if(!g_key_file_get_string(config, group, key, NULL))
+        return FALSE;
 
-       //TODO safteycheck value
-       g_key_file_set_string(config, group, key, value);
-       return TRUE;
+    //TODO safteycheck value
+    g_key_file_set_string(config, group, key, value);
+    return TRUE;
 }
 
 /* initial load/check */
 gboolean config_init() {
 
-       if(config)
-               return TRUE; //already init'd
+    if(config)
+        return TRUE; //already init'd
 
-       config = g_key_file_new();
-       
-       const gchar *config_path;
-       GStatBuf *config_lstat;
+    config = g_key_file_new();
+    
+    const gchar *config_path;
+    GStatBuf *config_lstat;
 
-       config_path = "/etc/systemd_compat.conf";
+    config_path = "/etc/systemd_compat.conf";
 
-       /* does conf exist? */
-       if(g_lstat(config_path, config_lstat)) {
+    /* does conf exist? */
+    if(g_lstat(config_path, config_lstat)) {
 
-               /* if not, can we write it? */
-               if(g_access("/etc/", W_OK)) {
-                       g_printf("%s\n", "no write permissions for /etc/! exiting..");
-                       return FALSE;
-               }
+        /* if not, can we write it */
+        if(g_access("/etc/", W_OK)) {
+            g_printf("%s\n", "no write permissions for /etc/! exiting..");
+            return FALSE;
+        }
 
-               config_descr = g_open(config_path, O_CREAT, 644);
+        int config_descr;
+        config_descr = g_open(config_path, O_CREAT, 644);
 
-               gchar *posix_hostname;
-               posix_hostname = g_malloc(255); 
+        gchar *posix_hostname;
+        posix_hostname = g_malloc(HOST_NAME_MAX); 
 
-               gethostname(posix_hostname, 255);
+        gethostname(posix_hostname, HOST_NAME_MAX);
 
-               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", "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;
-               }
+        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_printf("wrote config to %s\n", config_path);
 
-               g_free(posix_hostname);
+        g_free(posix_hostname);
 
-               return TRUE;
+        return TRUE;
 
-       /* it does exist, read it */
-       } else {
+    /* 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;
-               }
+        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;
 
-               g_printf("could not read config at %s! exiting..", config_path);
-               return FALSE;
-       }
+        g_printf("could not read config at %s! exiting..", config_path);
+        return FALSE;
+    }
 }
 
 gboolean init_xml() {
 
-       gchar **data_dir_prefix;        
+       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);
@@ -128,15 +143,18 @@ gboolean init_xml() {
                }
 
                g_printf("creating xml data directory %s...\n", data_dir);
-               if(g_mkdir(data_dir, 644) {
+               if(g_mkdir(data_dir, 644)) {
                        g_printf("failed to create dir %s...\n", data_dir);
                        return FALSE;
                }
 
-               set_xml_descriptors();
+               //set_xml_descriptors();
+       }
+}
+
 //LEFTOFF
                
-               gchar *posix_hostname;
+/*             gchar *posix_hostname;
                posix_hostname = g_malloc(255); 
 
                gethostname(posix_hostname, 255);
@@ -158,7 +176,7 @@ gboolean init_xml() {
 
                return TRUE;
 
-       /* it does exist, read it */
+       /* it does exist, read it */     /*
        } else {
 
                if(!g_access(config_path, W_OK)) {
@@ -175,7 +193,7 @@ gboolean init_xml() {
 
 
        return TRUE;
-}
+} */
 
 static void set_xml_descriptors() {