#include <limits.h>
#include <sys/param.h>
+#include <string.h>
#include <glib/gprintf.h>
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 *
/* 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,
}
-/* 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,
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;