X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Fmain.c;h=fc50a2445cdd8bc547163381d62f59c52ea7f6ab;hb=e3382563a24b6a3c162763942edefee462b2d752;hp=daa815732df9253fbffff0b81282643eb7bb8da8;hpb=a35a69c56004944df534779ed806d2a889904ba5;p=systembsd.git

diff --git a/src/main.c b/src/main.c
index daa8157..fc50a24 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,43 +1,77 @@
+/*
+ * 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 INSTALL 1
 //#define NO_BUILTIN_XML 1
 /* end debugging */
 
 #include <gio/gio.h>
-#include <config.c>
+#include <glib.h>
+#include <glib/gprintf.h>
+#include <glib/gstdio.h>
+#include "config.c"
 #include "interfaces/hostnamed/hostnamed.c"
-//#include "main.h"
-
-#ifdef INSTALL
-static gboolean install_conf() {
-	
-}
-#endif
+//#include "main/h"
 
-int main() {
-	//TODO cleanup
+gboolean systemd_utils_init() {
+<<<<<<< HEAD
 	#ifdef INSTALL
-		if(!install_conf()) {
-			g_printf("%s\n", "FAILED to install configs in /etc/!");
-			exit(1);
-		}
-	#endif
+		if(!config_init()) {
+			gchar *tmp;
+			tmp = "/etc/"; //what the hell is /etc/xdg anyway
+
+			g_printf("FAILED to install configs in %s!\n", tmp);
+			return FALSE;
+		} 
+		if(!init_xml()) {
+			gchar **tmp;
+			tmp = g_get_system_data_dirs();
 
-	//TODO cleanup
-	#if (defined NO_BUILTIN_XML && defined INSTALL)
-		if(!install_conf()) {
-			g_printf("%s\n", "FAILED to install xml configs!");
-			exit(1);
+			g_printf("FAILED to install xml configs in %s!\n", tmp[0]);
+			return FALSE;
 		}
-	#else
 	#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() {
 
-	GMainLoop *mloop = NULL;
-	
-	mloop = g_main_loop_new(NULL, FALSE);
-	hostnamed_init();
-	g_main_loop_run(mloop);
+    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
+    }
 
-	return 0;
-}
+    hostnamed_init();
 
+    mloop = g_main_loop_new(NULL, TRUE);
+
+    g_main_loop_run(mloop);
+    g_main_loop_unref(mloop);
+
+    return 0;
+}