X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=src%2Finterfaces%2Flocaled%2Flocaled.c;h=160caafa932d40e628d33030a27fd7a7016621a5;hp=e2fd3f44d201abac9780879291b5dfa396211c27;hb=254ceec0baac22cb12b44d2e7e223562b12c8d46;hpb=341587dbd94b8845b91baef896d9da2693df19bb

diff --git a/src/interfaces/localed/localed.c b/src/interfaces/localed/localed.c
index e2fd3f4..160caaf 100644
--- a/src/interfaces/localed/localed.c
+++ b/src/interfaces/localed/localed.c
@@ -70,7 +70,7 @@ static void localed_on_bus_acquired(GDBusConnection *conn,
                                     const gchar *name,
                                     gpointer user_data) {
 
-    g_print("got bus/name, exporting %s's interface...\n", name);
+    g_printf("got bus/name, exporting %s's interface...\n", name);
  
     localed_interf = locale1_skeleton_new();
 
@@ -133,8 +133,27 @@ void localed_mem_clean() {
 
 }
 
+/* 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() {
 
+	set_signal_handlers();
+
 	localed_loop = g_main_loop_new(NULL, TRUE);
 	localed_freeable = g_ptr_array_new();
 
@@ -148,11 +167,14 @@ int main() {
                                     NULL);
 
 	g_main_loop_run(localed_loop);
+	/* runs until single g_main_loop_quit() call is raised inside <interface>_mem_clean() */
 	g_main_loop_unref(localed_loop);
 
+	/* guaranteed unownable */
 	g_bus_unown_name(bus_descriptor);
 
-	localed_mem_clean();
+	/* at this point no operations can occur with our data, it is safe to free it + its container */
+	g_ptr_array_free(localed_freeable, TRUE);
 
 	return 0;
 }