projects
/
systembsd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hostname1 now returns hostname minus domain info
[systembsd.git]
/
src
/
interfaces
/
hostnamed
/
hostnamed.c
diff --git
a/src/interfaces/hostnamed/hostnamed.c
b/src/interfaces/hostnamed/hostnamed.c
index c45905dd16ab07eac09c3dd9bd912c4ef140728e..33ea79ead417772803d6eb5c7f7ee73ebbb8b2e0 100644
(file)
--- a/
src/interfaces/hostnamed/hostnamed.c
+++ b/
src/interfaces/hostnamed/hostnamed.c
@@
-18,18
+18,17
@@
#include <limits.h>
#include <sys/param.h>
#include <limits.h>
#include <sys/param.h>
+#include <string.h>
#include <glib/gprintf.h>
#include "hostnamed-gen.h"
GPtrArray *hostnamed_freeable;
#include <glib/gprintf.h>
#include "hostnamed-gen.h"
GPtrArray *hostnamed_freeable;
-GDBusNodeInfo *spect_data;
Hostname1 *hostnamed_interf;
Hostname1 *hostnamed_interf;
-/*
begin method/property/signal code
*/
+/*
--- begin method/property/signal code ---
*/
-/* TODO make sure these guys only work if called by root */
static gboolean
on_handle_set_hostname(Hostname1 *hn1_passed_interf,
GDBusMethodInvocation *invoc,
static gboolean
on_handle_set_hostname(Hostname1 *hn1_passed_interf,
GDBusMethodInvocation *invoc,
@@
-79,13
+78,20
@@
on_handle_set_icon_name(Hostname1 *hn1_passed_interf,
const gchar *
our_get_hostname() {
const gchar *
our_get_hostname() {
-
int hostname_try
;
-
gchar *hostname_buf
;
+
gchar *hostname_buf, *ret
;
+
size_t hostname_divider
;
hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN);
hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN);
- hostname_try = gethostname(hostname_buf, MAXHOSTNAMELEN);
+ ret = (gchar*) g_malloc0(MAXHOSTNAMELEN);
+ g_ptr_array_add(hostnamed_freeable, hostname_buf);
+ g_ptr_array_add(hostnamed_freeable, ret);
- return hostname_buf;
+ if(gethostname(hostname_buf, MAXHOSTNAMELEN))
+ return "";
+
+ hostname_divider = strcspn(hostname_buf, ".");
+
+ return strncpy(ret, hostname_buf, hostname_divider);
}
const gchar *
}
const gchar *
@@
-142,7
+148,7
@@
our_get_os_pretty_name() {
return "TODO";
}
return "TODO";
}
-/*
end method/property/signal code, begin bus/name handlers
*/
+/*
--- end method/property/signal code, begin bus/name handlers ---
*/
static void hostnamed_on_bus_acquired(GDBusConnection *conn,
const gchar *name,
static void hostnamed_on_bus_acquired(GDBusConnection *conn,
const gchar *name,
@@
-189,10
+195,13
@@
static void hostnamed_on_name_acquired(GDBusConnection *conn,
}
}
+/* --- end bus/name handlers, begin misc functions --- */
+
/* free()'s */
void hostnamed_mem_clean() {
g_ptr_array_foreach(hostnamed_freeable, (GFunc) g_free, NULL);
/* free()'s */
void hostnamed_mem_clean() {
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,
}
static void hostnamed_on_name_lost(GDBusConnection *conn,
@@
-206,12
+215,15
@@
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,
"org.freedesktop.hostname1",
G_BUS_NAME_OWNER_FLAGS_NONE,
hostnamed_on_bus_acquired,
@@
-220,20
+232,13
@@
void hostnamed_init() {
NULL,
NULL);
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_main_loop_run(hostnamed_loop);
g_main_loop_unref(hostnamed_loop);
+ g_bus_unown_name(bus_descriptor);
+
+ hostnamed_mem_clean();
+
return 0;
}
return 0;
}