X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Fmain.c;h=a592502631d4910631567bb44c4abd08ebbd392b;hb=881cd13b40104b1ac8aebf282eca72e2fa134ba2;hp=59e23fe96ea74a26525ccde1cba2d10b629a02b2;hpb=929eb2a9b45b11b5e3d76f1d4ac744853b7ab2fe;p=systembsd.git

diff --git a/src/main.c b/src/main.c
index 59e23fe..a592502 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,26 +1,67 @@
+/*
+ * 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.
+ */
+
 /* debugging */
 #define INSTALL 1
-#define NO_BUILTIN_XML 1
-
+//#define NO_BUILTIN_XML 1
 /* end debugging */
 
 #include <gio/gio.h>
+#include <glib.h>
+#include <glib/gprintf.h>
+#include <glib/gstdio.h>
+#include "config.c"
 #include "interfaces/hostnamed/hostnamed.c"
-#include "main.h"
+//#include "main/h"
 
-int main() {
+gboolean systemd_utils_init() {
+	#ifdef INSTALL
+		if(!config_init()) {
+			gchar *tmp;
+			tmp = "/etc/"; //what the hell is /etc/xdg anyway
 
-	#if (defined NO_BUILTIN_XML && defined INSTALL)
-		if(!install_conf())
-			g_printf("%s\n", "FAILED to install xml configs!");;		
-	#else
+			g_printf("FAILED to install configs in %s!\n", tmp);
+			return FALSE;
+		} 
+		if(!init_xml()) {
+			const gchar * const *tmp;
+			tmp = g_get_system_data_dirs();
+
+			g_printf("FAILED to install xml configs in %s!\n", tmp[0]);
+			return FALSE;
+		}
 	#endif
+	return TRUE;
+}
+
+int main() {
+
+    GMainLoop *mloop;
+    
+    if(!systemd_utils_init()) {
+        g_printf("failed to init, are you root?\n");
+        return 1; //TODO errno properly. grep for all "return 1;"s, not TODO'ing each one
+    }
+
+    hostnamed_init();
+
+    mloop = g_main_loop_new(NULL, TRUE);
 
-	GMainLoop *mloop = NULL;
-	
-	mloop = g_main_loop_new(NULL, FALSE);
-	hostnamed_init();
-	g_main_loop_run(mloop);
+    g_main_loop_run(mloop);
+    g_main_loop_unref(mloop);
 
-	return 0;
+    return 0;
 }