X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Fconfig.c;h=68ea3be92f882ad4c249ae374301f30188050e16;hb=1aa981f72eb5da974b88794558539feaef4d5336;hp=3c20820d9b7d08cd31aa8ba5005d2c86c858b21e;hpb=e3382563a24b6a3c162763942edefee462b2d752;p=systembsd.git

diff --git a/src/config.c b/src/config.c
index 3c20820..68ea3be 100644
--- a/src/config.c
+++ b/src/config.c
@@ -17,29 +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 const gchar *CONFIG_KEYS[] = {
-    "PrettyHostname",
-    "IconName",
-    "ChassisType"
-};
-
 /* NULL if key doesn't exist */
 gchar *get_option(gchar *key, gchar *group) {
 
@@ -58,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;
 }
@@ -66,61 +49,35 @@ gboolean set_option(gchar *key, gchar *value, gchar *group) {
 /* initial load/check */
 gboolean config_init() {
 
+    /* config is already set */
     if(config)
-        return TRUE; //already init'd
-
+        return TRUE;
+    
     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 not, can we write it */
-        if(g_access("/etc/", W_OK)) {
-            g_printf("%s\n", "no write permissions for /etc/! exiting..");
-            return FALSE;
-        }
-
-        int config_descr;
-        config_descr = g_open(config_path, O_CREAT, 644);
+    if(g_access(config_path, W_OK)) {
 
-        gchar *posix_hostname;
-        posix_hostname = g_malloc(HOST_NAME_MAX); 
-
-        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
-
-        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);
+        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;
 
-    /* it does exist, read it */
-    } else {
+    g_printf("could not read config at %s! exiting..", config_path);
+    return FALSE;
+}
 
-        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;
+void clean_config() {
 
-        g_printf("could not read config at %s! exiting..", config_path);
-        return FALSE;
-    }
-}
+    /* TODO g_ptr_array all of this */
+    g_free(config);
+    g_free(data_dir);
+    g_close(config_descr, NULL);
 }