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

diff --git a/src/config.c b/src/config.c
index 2b5ec06..68ea3be 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1,107 +1,83 @@
+/*
+ * 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>
+#include "config.h"
 
 static GKeyFile *config;
 static int config_descr;
-
-static const gchar *CONFIG_KEYS[] = {
-	"PrettyHostname",
-	"IconName",
-	"ChassisType"
-};
+static gchar *data_dir;
 
 /* 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
-
-	config = g_key_file_new();
-	
-	const gchar *config_path;
-	GStatBuf *config_lstat;
-
-	config_path = "/etc/systemd_compat.conf";
-
-	/* 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;
-		}
-
-		config_descr = g_open(config_path, O_CREAT, 644);
+    /* config is already set */
+    if(config)
+        return TRUE;
+    
+    config = g_key_file_new();
+    
+    const gchar *config_path;
+    GStatBuf *config_lstat;
+    int config_lstat_ret;
 
-		gchar *posix_hostname;
-		posix_hostname = g_malloc(255); 
+    config_path = "/etc/systemd_compat.conf";
+    config_lstat_ret = g_lstat(config_path, config_lstat);
 
-		gethostname(posix_hostname, 255);
+    if(g_access(config_path, W_OK)) {
 
-		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_printf("%s\n", "no write permissions for /etc/! exiting..");
+        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;
-		}
+    } else if(g_key_file_load_from_file(config, config_path, G_KEY_FILE_KEEP_COMMENTS, NULL))
+        return TRUE;
 
-		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;
-	}
+    g_printf("could not read config at %s! exiting..", config_path);
+    return FALSE;
 }
 
 void clean_config() {
 
-	if(config)
-		g_free(config);
-
-	if(config_descr)
-		g_close(config_descr, NULL);
-
+    /* TODO g_ptr_array all of this */
+    g_free(config);
+    g_free(data_dir);
+    g_close(config_descr, NULL);
 }