X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=src%2Finterfaces%2Fhostnamed%2Fhostnamed.c;h=33ea79ead417772803d6eb5c7f7ee73ebbb8b2e0;hp=1bfcd6541b4e8a21bf772402c8739d2d06c91839;hb=28cac2f0037a0f2d5f8f8f783cd157af858530ab;hpb=7323a4e4d86ebad64465ce88a103ee4383af0924

diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c
index 1bfcd65..33ea79e 100644
--- a/src/interfaces/hostnamed/hostnamed.c
+++ b/src/interfaces/hostnamed/hostnamed.c
@@ -18,6 +18,7 @@
 #include <limits.h>
 
 #include <sys/param.h>
+#include <string.h>
 
 #include <glib/gprintf.h>
 
@@ -77,15 +78,20 @@ on_handle_set_icon_name(Hostname1 *hn1_passed_interf,
 const gchar *
 our_get_hostname() {
 
-	gchar *hostname_buf;
+	gchar *hostname_buf, *ret;
+	size_t hostname_divider;
 
 	hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN);
+	ret          = (gchar*) g_malloc0(MAXHOSTNAMELEN);
 	g_ptr_array_add(hostnamed_freeable, hostname_buf);
+	g_ptr_array_add(hostnamed_freeable, ret);
 
 	if(gethostname(hostname_buf, MAXHOSTNAMELEN))
 		return "";
 
-	return hostname_buf;
+	hostname_divider = strcspn(hostname_buf, ".");
+
+	return strncpy(ret, hostname_buf, hostname_divider);
 }
 
 const gchar *
@@ -194,8 +200,8 @@ static void hostnamed_on_name_acquired(GDBusConnection *conn,
 /* free()'s */
 void hostnamed_mem_clean() {
 
-    ddg_ptr_array_foreach(hostnamed_freeable, (GFunc) g_free, NULL);
-	g_ptr_array_free(hostnamed_freeable);
+    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,
@@ -209,12 +215,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,
@@ -223,19 +232,11 @@ 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;