X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=src%2Finterfaces%2Fhostnamed%2Fhostnamed.c;h=d54fb379dc4de93a6a47253fc70508c8ba573527;hp=c45905dd16ab07eac09c3dd9bd912c4ef140728e;hb=8caf1f61176468ec3d887fb401c213df57fdfa11;hpb=1be94ede1c604325211efe45754026d1d2bac3cf

diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c
index c45905d..d54fb37 100644
--- a/src/interfaces/hostnamed/hostnamed.c
+++ b/src/interfaces/hostnamed/hostnamed.c
@@ -18,18 +18,18 @@
 #include <limits.h>
 
 #include <sys/param.h>
+#include <string.h>
 
 #include <glib/gprintf.h>
+#include <glib-unix.h>
 
 #include "hostnamed-gen.h"
 
 GPtrArray *hostnamed_freeable;
-GDBusNodeInfo *spect_data;
 Hostname1 *hostnamed_interf;
 
-/* begin method/property/signal code */
+/* --- begin method/property/signal code --- */
 
-/* TODO make sure these guys only work if called by root */
 static gboolean
 on_handle_set_hostname(Hostname1 *hn1_passed_interf,
                        GDBusMethodInvocation *invoc,
@@ -79,13 +79,20 @@ on_handle_set_icon_name(Hostname1 *hn1_passed_interf,
 const gchar *
 our_get_hostname() {
 
-	int hostname_try;
-	gchar *hostname_buf;
+	gchar *hostname_buf, *ret;
+	size_t hostname_divider;
 
 	hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN);
-	hostname_try = gethostname(hostname_buf, MAXHOSTNAMELEN);
+	ret          = (gchar*) g_malloc0(MAXHOSTNAMELEN);
+	g_ptr_array_add(hostnamed_freeable, hostname_buf);
+	g_ptr_array_add(hostnamed_freeable, ret);
 
-	return hostname_buf;
+	if(gethostname(hostname_buf, MAXHOSTNAMELEN))
+		return "";
+
+	hostname_divider = strcspn(hostname_buf, ".");
+
+	return strncpy(ret, hostname_buf, hostname_divider);
 }
 
 const gchar *
@@ -142,7 +149,7 @@ our_get_os_pretty_name() {
     return "TODO";
 }
 
-/* end method/property/signal code, begin bus/name handlers */
+/* --- end method/property/signal code, begin bus/name handlers --- */
 
 static void hostnamed_on_bus_acquired(GDBusConnection *conn,
                             const gchar *name,
@@ -189,10 +196,13 @@ static void hostnamed_on_name_acquired(GDBusConnection *conn,
 
 }
 
+/* --- end bus/name handlers, begin misc functions --- */
+
 /* free()'s */
 void hostnamed_mem_clean() {
 
     g_ptr_array_foreach(hostnamed_freeable, (GFunc) g_free, NULL);
+	g_ptr_array_free(hostnamed_freeable, TRUE);
 }
 
 static void hostnamed_on_name_lost(GDBusConnection *conn,
@@ -206,12 +216,15 @@ static void hostnamed_on_name_lost(GDBusConnection *conn,
 
 }
 
-/* safe call to try and start hostnamed */
-void hostnamed_init() {
+int main() {
 
-    guint bus_descriptor;
+	guint bus_descriptor;
+	GMainLoop *hostnamed_loop;
 
-    bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM,
+	hostnamed_loop = g_main_loop_new(NULL, TRUE);
+	hostnamed_freeable = g_ptr_array_new();
+
+	 bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM,
                                     "org.freedesktop.hostname1",
                                     G_BUS_NAME_OWNER_FLAGS_NONE,
                                     hostnamed_on_bus_acquired,
@@ -220,20 +233,13 @@ void hostnamed_init() {
                                     NULL,
                                     NULL);
 
-}
-
-int main() {
-
-	GMainLoop *hostnamed_loop;
-	hostnamed_loop = g_main_loop_new(NULL, TRUE);
-
-	/* config stuff here */
-
-
-	hostnamed_init();
 	g_main_loop_run(hostnamed_loop);
 	g_main_loop_unref(hostnamed_loop);
 
+	g_bus_unown_name(bus_descriptor);
+
+	hostnamed_mem_clean();
+
 	return 0;
 }