(7) add set_signal_handlers() to bind functions during init

[systembsd.git] / src / interfaces / localed / localed.c

diff --git a/src/interfaces/localed/localed.c b/src/interfaces/localed/localed.c
index c11ae36b2c5be0f8a2bb6aaaa00070bd83abc8cf..27448acb59e0fa832ffb56a44ff6c6dca578a975 100644 (file)
--- a/src/interfaces/localed/localed.c
+++ b/src/interfaces/localed/localed.c
@@ -70,16 +70,8 @@ static void localed_on_bus_acquired(GDBusConnection *conn,
                                     const gchar *name,
                                     gpointer user_data) {
 
-    g_print("got bus, name: %s\n", name);   
-
-}
-
-static void localed_on_name_acquired(GDBusConnection *conn,
-                                        const gchar *name,
-                                     gpointer user_data) {
-
-    g_print("got '%s' on system bus\n", name);
-
+    g_print("got bus/name, exporting %s's interface...\n", name);
+ 
     localed_interf = locale1_skeleton_new();
 
     /* attach function pointers to generated struct's method handlers 
@@ -93,29 +85,69 @@ static void localed_on_name_acquired(GDBusConnection *conn,
                                          "/org/freedesktop/locale1",
                                          NULL)) {
 
-        g_printf("Failed to export Locale1's interface!");
+        g_printf("failed to export %s's interface!\n", name);
+        localed_mem_clean();
+
+    } else {
+
+        dbus_interface_exported = TRUE;
+        g_printf("exported %s's interface on the system bus...\n", name);
     }
+}
+
+static void localed_on_name_acquired(GDBusConnection *conn,
+                                        const gchar *name,
+                                     gpointer user_data) {
 
+       g_printf("success!\n");
 }
 
 static void localed_on_name_lost(GDBusConnection *conn,
                                    const gchar *name,
                                    gpointer user_data) {
 
-    g_print("lost name %s, exiting...", name);
+       if(!conn) {
 
-    localed_mem_clean();
-    g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(localed_interf));
+               g_printf("failed to connect to the system bus while trying to acquire name '%s': either dbus-daemon isn't running or we don't have permission to push names and/or their interfaces to it.\n", name);
+               localed_mem_clean();
+       }
 
+       g_print("lost name %s, exiting...\n", name);
+
+    localed_mem_clean();
 }
 
 /* --- end bus/name handlers, begin misc unix functions --- */
 
-/* free()'s */
+/* safe call to clean and then exit
+ * this stops our GMainLoop safely before letting main() return */
 void localed_mem_clean() {
 
-    g_ptr_array_foreach(localed_freeable, (GFunc) g_free, NULL);
-       g_ptr_array_free(localed_freeable, TRUE);
+       g_printf("exiting...\n");
+
+       if(dbus_interface_exported)
+               g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(localed_interf));
+
+       if(g_main_loop_is_running(localed_loop))
+               g_main_loop_quit(localed_loop);
+
+}
+
+/* wrapper for glib's unix signal handling; called only once if terminating signal is raised against us */
+gboolean unix_sig_terminate_handler(gpointer data) {
+
+       g_printf("caught SIGINT/HUP/TERM, exiting\n");
+
+       localed_mem_clean();
+       return G_SOURCE_REMOVE;
+}
+
+void set_signal_handlers() {
+
+    /* we don't care about its descriptor, we never need to unregister these */
+    g_unix_signal_add(SIGINT,  unix_sig_terminate_handler, NULL);
+    g_unix_signal_add(SIGHUP,  unix_sig_terminate_handler, NULL);
+    g_unix_signal_add(SIGTERM, unix_sig_terminate_handler, NULL);
 }
 
 int main() {