X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=src%2Fmain.c;h=3bc43447469fb9dc80caaf56caaee51241931094;hp=82d68f8da7f1f5397d05ae468d631dc3214bc88f;hb=7f0a0212d65905aea6c875b6250e0a87dc9820d8;hpb=39df684714f381d12e902de486e20a23c2e78bec

diff --git a/src/main.c b/src/main.c
index 82d68f8..3bc4344 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,38 +1,84 @@
-/* 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>
 #include <glib/gprintf.h>
 #include <glib/gstdio.h>
+
 #include "config.c"
+
 #include "interfaces/hostnamed/hostnamed.c"
-//#include "main/h"
+#include "interfaces/localed/localed.c"
+#include "interfaces/timedated/timedated.c"
+#include "interfaces/logind/logind.c"
 
 gboolean systemd_utils_init() {
-	#ifdef INSTALL
-		if(!config_init()) {
-			g_printf("%s\n", "FAILED to install configs in /etc/!");
-			return FALSE; 
-		}
-	#endif
-	return TRUE;
+
+	if(!config_init()) {
+        gchar *tmp;
+        tmp = "/etc/systemd_compat.conf"; 
+
+        g_printf("FAILED to open config %s! did you `make install`?\n", tmp);
+        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;		
+	mloop = g_main_loop_new(NULL, TRUE);
+
+	#ifdef COMPILE_HOSTNAMED_BINARY
+		hostnamed_init();
+	#endif
+	#ifdef COMPILE_LOCALED_BINARY
+		localed_init();
+	#endif
+	#ifdef COMPILE_TIMEDATED_BINARY
+	#endif
+	#ifdef COMPILE_LOGIND_BINARY
+	#endif
+
+	#if !defined(COMPILE_HOSTNAMED_BINARY) && !defined(COMPILE_LOCALED_BINARY) && !defined(COMPILE_TIMEDATED_BINARY) && !defined(COMPILE_LOGIND_BINARY)
+		
+		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();
+		gboolean hostnamed_init_ok, localed_init_ok;
+		GPid *hostnamed_pid, *localed_pid;
+		gchar *hostnamed_argv[0], *localed_argv[0];
+		GSource *hostnamed_source, *localed_source, *timedated_source, *logind_source;
 
-	mloop = g_main_loop_new(NULL, TRUE);
+		hostnamed_argv[0] = "/usr/local/libexec/systemd-hostnamed-handler";
+		localed_argv[0] = "/usr/local/libexec/systemd-localed-handler";
+
+		hostnamed_init_ok = g_spawn_async(NULL, hostnamed_argv, NULL, G_SPAWN_DEFAULT, NULL, NULL, hostnamed_pid, NULL);
+		localed_init_ok = g_spawn_async(NULL, localed_argv, NULL, G_SPAWN_DEFAULT, NULL, NULL, localed_pid, NULL);
+
+		hostnamed_source = g_child_watch_source_new(*hostnamed_pid);
+		localed_source = g_child_watch_source_new(*localed_pid);
+
+		/*g_source_attach(hostnamed_source, NULL);
+		g_source_attach(localed_source, NULL);*/
+
+	#endif
 
 	g_main_loop_run(mloop);
 	g_main_loop_unref(mloop);