X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.c;h=f8cb5efafd225102e3178566d0f9dc8c8eea3135;hb=355f60ae9b0585f1910b8d61e09ff7be57b9fb96;hp=3e80e28e989d91de16cd8470ab6ce746fff16b3d;hpb=4241079f6154438e2ed64ee1a46b4cba6f1cde01;p=systembsd.git

diff --git a/src/main.c b/src/main.c
index 3e80e28..f8cb5ef 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,7 +1,18 @@
-/* debugging */
-#define INSTALL 1
-//#define NO_BUILTIN_XML 1
-/* end debugging */
+/*
+ * 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 <gio/gio.h>
 #include <glib.h>
@@ -9,43 +20,40 @@
 #include <glib/gstdio.h>
 #include "config.c"
 #include "interfaces/hostnamed/hostnamed.c"
-//#include "main/h"
 
 gboolean systemd_utils_init() {
-	#ifdef INSTALL
-		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();
-
-			g_printf("FAILED to install xml configs in %s!\n", tmp[0]);
-			return FALSE;
-		}
-	#endif
-	return TRUE;
+    if(!config_init()) {
+        gchar *tmp;
+        tmp = "/etc/systemd_compat.conf"; 
+
+        g_printf("FAILED to open config %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;
+    }*/
+    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
-	}
+    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();
+    hostnamed_init();
 
-	mloop = g_main_loop_new(NULL, TRUE);
+    mloop = g_main_loop_new(NULL, TRUE);
 
-	g_main_loop_run(mloop);
-	g_main_loop_unref(mloop);
+    g_main_loop_run(mloop);
+    g_main_loop_unref(mloop);
 
-	return 0;
+    return 0;
 }