X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=src%2Finterfaces%2Flocaled%2Flocaled.c;h=c11ae36b2c5be0f8a2bb6aaaa00070bd83abc8cf;hp=d6bf1aac4fd30a1b03c70696c563d6a93faeee39;hb=c12c41f4eac2e4d7c3244af3c49735aeffd78e2d;hpb=1e8c7c889a1c3b92c58fb1590b2f1192dd86623b diff --git a/src/interfaces/localed/localed.c b/src/interfaces/localed/localed.c index d6bf1aa..c11ae36 100644 --- a/src/interfaces/localed/localed.c +++ b/src/interfaces/localed/localed.c @@ -16,124 +16,114 @@ #include #include +#include + +#include +#include + +#include +#include #include "localed-gen.h" +#include "localed.h" GPtrArray *localed_freeable; -GDBusNodeInfo *spect_data; -localedLocale1 *localed_interf; +Locale1 *localed_interf; + +GMainLoop *localed_loop; -/* begin method/property/signal code */ +guint bus_descriptor; +gboolean dbus_interface_exported; /* reliable because of gdbus operational guarantees */ -/* TODO make sure these guys only work if called by root */ +/* --- begin method/property/dbus signal code --- */ -/* Example: -static gboolean -on_handle_set_hostname(localedLocale1 *hn1_passed_interf, +/*static gboolean +on_handle_set_hostname(Locale1 *hn1_passed_interf, GDBusMethodInvocation *invoc, const gchar *greet, gpointer data) { return FALSE; -} */ - -/* note: all localed/locale1's properties are read-only, - * and do not need set_ functions, gdbus-codegen realized - * this from the XML and handled the to-be error of trying - * to set a read-only property's value - */ - -/* Example: +} const gchar * our_get_hostname() { - return "TODO"; + 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); + + if(gethostname(hostname_buf, MAXHOSTNAMELEN)) + return ""; + + hostname_divider = strcspn(hostname_buf, "."); + + return strncpy(ret, hostname_buf, hostname_divider); }*/ -/* end method/property/signal code, begin bus/name handlers */ +/* --- end method/property/dbus signal code, begin bus/name handlers --- */ static void localed_on_bus_acquired(GDBusConnection *conn, - const gchar *name, - gpointer user_data) { + 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) { + const gchar *name, + gpointer user_data) { g_print("got '%s' on system bus\n", name); - localed_interf = localed_locale1_skeleton_new(); - - /* attach function pointers to generated struct's method handlers */ - /*g_signal_connect(localed_interf, "handle-set-hostname", G_CALLBACK(on_handle_set_hostname), NULL); - g_signal_connect(localed_interf, "handle-set-static-hostname", G_CALLBACK(on_handle_set_static_hostname), NULL); - g_signal_connect(localed_interf, "handle-set-pretty-hostname", G_CALLBACK(on_handle_set_pretty_hostname), NULL); - g_signal_connect(localed_interf, "handle-set-chassis", G_CALLBACK(on_handle_set_chassis), NULL); - g_signal_connect(localed_interf, "handle-set-icon-name", G_CALLBACK(on_handle_set_icon_name), NULL); */ - - /* set our properties before export */ - /*localed_locale1_set_hostname(localed_interf, our_get_hostname()); - localed_locale1_set_static_hostname(localed_interf, our_get_static_hostname()); - localed_locale1_set_pretty_hostname(localed_interf, our_get_pretty_hostname()); - localed_locale1_set_chassis(localed_interf, our_get_chassis()); - localed_locale1_set_icon_name(localed_interf, our_get_icon_name()); - localed_locale1_set_kernel_name(localed_interf, our_get_kernel_name()); - localed_locale1_set_kernel_version(localed_interf, our_get_kernel_version()); - localed_locale1_set_kernel_release(localed_interf, our_get_kernel_release()); - localed_locale1_set_operating_system_cpename(localed_interf, our_get_os_cpename()); - localed_locale1_set_operating_system_pretty_name(localed_interf, our_get_os_pretty_name()); */ + localed_interf = locale1_skeleton_new(); + + /* attach function pointers to generated struct's method handlers + g_signal_connect(localed_interf, "handle-set-hostname", G_CALLBACK(on_handle_set_hostname), NULL); */ + + /* set our properties before export + locale1_set_hostname(localed_interf, our_get_hostname()); */ if(!g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(localed_interf), - conn, - "/org/freedesktop/locale1", - NULL)) { + conn, + "/org/freedesktop/locale1", + NULL)) { - g_printf("failed to export locale1's interface on system bus!"); + g_printf("Failed to export Locale1's interface!"); } } -/* free()'s */ -void localed_mem_clean() { - - g_ptr_array_foreach(localed_freeable, (GFunc) g_free, NULL); -} - static void localed_on_name_lost(GDBusConnection *conn, - const gchar *name, - gpointer user_data) { + const gchar *name, + gpointer user_data) { g_print("lost name %s, exiting...", name); localed_mem_clean(); g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(localed_interf)); - /* TODO exit through g_main_loop properly... */ } -/* safe call to try and start localed */ -void localed_init() { +/* --- end bus/name handlers, begin misc unix functions --- */ - guint bus_descriptor; - GError *err = NULL; - gchar **localed_ispect_xml; - gchar *localed_joined_xml; +/* free()'s */ +void localed_mem_clean() { - localed_freeable = g_ptr_array_new(); - localed_ispect_xml = g_malloc(3000); + g_ptr_array_foreach(localed_freeable, (GFunc) g_free, NULL); + g_ptr_array_free(localed_freeable, TRUE); +} - g_file_get_contents("conf/localed-ispect.xml", localed_ispect_xml, NULL, NULL); - localed_joined_xml = g_strjoinv("\n", localed_ispect_xml); - spect_data = g_dbus_node_info_new_for_xml(localed_joined_xml, NULL); +int main() { - g_free(localed_ispect_xml); - g_ptr_array_add(localed_freeable, localed_joined_xml); + 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, @@ -142,21 +132,12 @@ void localed_init() { NULL, NULL); - /* TODO: malloc and return reference as if a main() closed */ -} - -int main() { - - GMainLoop *localed_loop; - localed_loop = g_main_loop_new(NULL, TRUE); - - /* config stuff here */ - - localed_init(); - g_main_loop_run(localed_loop); g_main_loop_unref(localed_loop); + g_bus_unown_name(bus_descriptor); + + localed_mem_clean(); + return 0; } -