X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=src%2Finterfaces%2Flocaled%2Flocaled.c;h=33769a3f06a4ba3449533d8c466ae8a098058a5b;hp=10ae7b714337f44bd60f796f908f4e1cdbabed4f;hb=483e90b704090617eba8bf030d23eca616063b21;hpb=509599f043fd77c5eee595ebce117ff9e11a5324

diff --git a/src/interfaces/localed/localed.c b/src/interfaces/localed/localed.c
index 10ae7b7..33769a3 100644
--- a/src/interfaces/localed/localed.c
+++ b/src/interfaces/localed/localed.c
@@ -23,10 +23,13 @@
 
 #include <glib/gprintf.h>
 #include <glib-unix.h>
+#include <polkit/polkit.h>
 
 #include "localed-gen.h"
 #include "localed.h"
 
+#include "../../polkit-auth.h"
+
 GPtrArray *localed_freeable;
 Locale1 *localed_interf;
 
@@ -48,20 +51,20 @@ on_handle_set_hostname(Locale1 *hn1_passed_interf,
 const gchar *
 our_get_hostname() {
 
-	gchar *hostname_buf, *ret;
-	size_t hostname_divider;
+    gchar *hostname_buf, *ret;
+    size_t hostname_divider;
 
-	hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN);
-	ret          = (gchar*) g_malloc0(MAXHOSTNAMELEN);
-	g_ptr_array_add(localed_freeable, hostname_buf);
-	g_ptr_array_add(localed_freeable, ret);
+    hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN);
+    ret          = (gchar*) g_malloc0(MAXHOSTNAMELEN);
+    g_ptr_array_add(localed_freeable, hostname_buf);
+    g_ptr_array_add(localed_freeable, ret);
 
-	if(gethostname(hostname_buf, MAXHOSTNAMELEN))
-		return "";
+    if(gethostname(hostname_buf, MAXHOSTNAMELEN))
+        return "";
 
-	hostname_divider = strcspn(hostname_buf, ".");
+    hostname_divider = strcspn(hostname_buf, ".");
 
-	return strncpy(ret, hostname_buf, hostname_divider);
+    return strncpy(ret, hostname_buf, hostname_divider);
 }*/
 
 /* --- end method/property/dbus signal code, begin bus/name handlers --- */
@@ -70,7 +73,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();
 
@@ -96,23 +99,23 @@ static void localed_on_bus_acquired(GDBusConnection *conn,
 }
 
 static void localed_on_name_acquired(GDBusConnection *conn,
-    		                         const gchar *name,
+                                     const gchar *name,
                                      gpointer user_data) {
 
-	g_printf("success!\n");
+    g_printf("success!\n");
 }
 
 static void localed_on_name_lost(GDBusConnection *conn,
                                    const gchar *name,
                                    gpointer user_data) {
 
-	if(!conn) {
+    if(!conn) {
 
-		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_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);
+    g_print("lost name %s, exiting...\n", name);
 
     localed_mem_clean();
 }
@@ -123,16 +126,41 @@ static void localed_on_name_lost(GDBusConnection *conn,
  * 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() {
 
-	localed_loop = g_main_loop_new(NULL, TRUE);
-	localed_freeable = g_ptr_array_new();
+    set_signal_handlers();
+
+    localed_loop = g_main_loop_new(NULL, TRUE);
+    localed_freeable = g_ptr_array_new();
 
-	 bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM,
+     bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM,
                                     "org.freedesktop.locale1",
                                     G_BUS_NAME_OWNER_FLAGS_NONE,
                                     localed_on_bus_acquired,
@@ -141,12 +169,15 @@ int main() {
                                     NULL,
                                     NULL);
 
-	g_main_loop_run(localed_loop);
-	g_main_loop_unref(localed_loop);
+    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);
 
-	g_bus_unown_name(bus_descriptor);
+    /* 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;
+    return 0;
 }