chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: Fix typo
[elogind.git]
/
src
/
libsystemd-bus
/
bus-control.c
diff --git
a/src/libsystemd-bus/bus-control.c
b/src/libsystemd-bus/bus-control.c
index e4cc251a4b2937046fc159d6a6f7c089e4be3c54..a0abccf1ddbbcda484c3e0107d27c9db950c2763 100644
(file)
--- a/
src/libsystemd-bus/bus-control.c
+++ b/
src/libsystemd-bus/bus-control.c
@@
-27,16
+27,26
@@
#include "sd-bus.h"
#include "bus-internal.h"
#include "bus-message.h"
#include "sd-bus.h"
#include "bus-internal.h"
#include "bus-message.h"
+#include "bus-control.h"
+
+int sd_bus_get_unique_name(sd_bus *bus, const char **unique) {
+ int r;
-const char *sd_bus_get_unique_name(sd_bus *bus) {
if (!bus)
if (!bus)
- return NULL;
+ return -EINVAL;
+ if (!unique)
+ return -EINVAL;
- return bus->unique_name;
+ r = bus_ensure_running(bus);
+ if (r < 0)
+ return r;
+
+ *unique = bus->unique_name;
+ return 0;
}
int sd_bus_request_name(sd_bus *bus, const char *name, int flags) {
}
int sd_bus_request_name(sd_bus *bus, const char *name, int flags) {
- _cleanup_bus_message_unref_ sd_bus_message *
m = NULL, *
reply = NULL;
+ _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
uint32_t ret;
int r;
uint32_t ret;
int r;
@@
-45,21
+55,17
@@
int sd_bus_request_name(sd_bus *bus, const char *name, int flags) {
if (!name)
return -EINVAL;
if (!name)
return -EINVAL;
- r = sd_bus_
message_new_method_call
(
+ r = sd_bus_
call_method
(
bus,
"org.freedesktop.DBus",
"/",
"org.freedesktop.DBus",
"RequestName",
bus,
"org.freedesktop.DBus",
"/",
"org.freedesktop.DBus",
"RequestName",
- &m);
- if (r < 0)
- return r;
-
- r = sd_bus_message_append(m, "su", name, flags);
- if (r < 0)
- return r;
-
- r = sd_bus_send_with_reply_and_block(bus, m, (uint64_t) -1, NULL, &reply);
+ NULL,
+ &reply,
+ "su",
+ name,
+ flags);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-71,7
+77,7
@@
int sd_bus_request_name(sd_bus *bus, const char *name, int flags) {
}
int sd_bus_release_name(sd_bus *bus, const char *name) {
}
int sd_bus_release_name(sd_bus *bus, const char *name) {
- _cleanup_bus_message_unref_ sd_bus_message *
m = NULL, *
reply = NULL;
+ _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
uint32_t ret;
int r;
uint32_t ret;
int r;
@@
-80,21
+86,16
@@
int sd_bus_release_name(sd_bus *bus, const char *name) {
if (!name)
return -EINVAL;
if (!name)
return -EINVAL;
- r = sd_bus_
message_new_method_call
(
+ r = sd_bus_
call_method
(
bus,
"org.freedesktop.DBus",
"/",
"org.freedesktop.DBus",
"ReleaseName",
bus,
"org.freedesktop.DBus",
"/",
"org.freedesktop.DBus",
"ReleaseName",
- &m);
- if (r < 0)
- return r;
-
- r = sd_bus_message_append(m, "s", name);
- if (r < 0)
- return r;
-
- r = sd_bus_send_with_reply_and_block(bus, m, (uint64_t) -1, NULL, &reply);
+ NULL,
+ &reply,
+ "s",
+ name);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-106,8
+107,7
@@
int sd_bus_release_name(sd_bus *bus, const char *name) {
}
int sd_bus_list_names(sd_bus *bus, char ***l) {
}
int sd_bus_list_names(sd_bus *bus, char ***l) {
- _cleanup_bus_message_unref_ sd_bus_message *m1 = NULL, *reply1 = NULL, *m2 = NULL, *reply2 = NULL;
- _cleanup_strv_free_ char **a = NULL, **b = NULL;
+ _cleanup_bus_message_unref_ sd_bus_message *reply1 = NULL, *reply2 = NULL;
char **x = NULL;
int r;
char **x = NULL;
int r;
@@
-116,52
+116,49
@@
int sd_bus_list_names(sd_bus *bus, char ***l) {
if (!l)
return -EINVAL;
if (!l)
return -EINVAL;
- r = sd_bus_
message_new_method_call
(
+ r = sd_bus_
call_method
(
bus,
"org.freedesktop.DBus",
"/",
"org.freedesktop.DBus",
"ListNames",
bus,
"org.freedesktop.DBus",
"/",
"org.freedesktop.DBus",
"ListNames",
- &m1);
+ NULL,
+ &reply1,
+ NULL);
if (r < 0)
return r;
if (r < 0)
return r;
- r = sd_bus_
message_new_method_call
(
+ r = sd_bus_
call_method
(
bus,
"org.freedesktop.DBus",
"/",
"org.freedesktop.DBus",
"ListActivatableNames",
bus,
"org.freedesktop.DBus",
"/",
"org.freedesktop.DBus",
"ListActivatableNames",
- &m2);
+ NULL,
+ &reply2,
+ NULL);
if (r < 0)
return r;
if (r < 0)
return r;
- r = sd_bus_send_with_reply_and_block(bus, m1, (uint64_t) -1, NULL, &reply1);
- if (r < 0)
+ r = bus_message_read_strv_extend(reply1, &x);
+ if (r < 0) {
+ strv_free(x);
return r;
return r;
+ }
- r = sd_bus_send_with_reply_and_block(bus, m2, (uint64_t) -1, NULL, &reply2);
- if (r < 0)
+ r = bus_message_read_strv_extend(reply2, &x);
+ if (r < 0) {
+ strv_free(x);
return r;
return r;
-
- r = sd_bus_message_read(reply1, "as", &a);
- if (r < 0)
- return r;
-
- r = sd_bus_message_read(reply2, "as", &b);
- if (r < 0)
- return r;
-
- x = strv_merge(a, b);
- if (!x)
- return -ENOMEM;
+ }
*l = strv_uniq(x);
return 0;
}
int sd_bus_get_owner(sd_bus *bus, const char *name, char **owner) {
*l = strv_uniq(x);
return 0;
}
int sd_bus_get_owner(sd_bus *bus, const char *name, char **owner) {
- _cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL;
+ _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+ const char *found;
int r;
if (!bus)
int r;
if (!bus)
@@
-169,29
+166,38
@@
int sd_bus_get_owner(sd_bus *bus, const char *name, char **owner) {
if (!name)
return -EINVAL;
if (!name)
return -EINVAL;
- r = sd_bus_
message_new_method_call
(
+ r = sd_bus_
call_method
(
bus,
"org.freedesktop.DBus",
"/",
"org.freedesktop.DBus",
"GetNameOwner",
bus,
"org.freedesktop.DBus",
"/",
"org.freedesktop.DBus",
"GetNameOwner",
- &m);
+ NULL,
+ &reply,
+ "s",
+ name);
if (r < 0)
return r;
if (r < 0)
return r;
- r = sd_bus_message_
append(m, "s", name
);
+ r = sd_bus_message_
read(reply, "s", &found
);
if (r < 0)
return r;
if (r < 0)
return r;
- r = sd_bus_send_with_reply_and_block(bus, m, (uint64_t) -1, NULL, &reply);
- if (r < 0)
- return r;
+ if (owner) {
+ char *t;
- return sd_bus_message_read(reply, "s", owner);
+ t = strdup(found);
+ if (!t)
+ return -ENOMEM;
+
+ *owner = t;
+ }
+
+ return 0;
}
int sd_bus_get_owner_uid(sd_bus *bus, const char *name, uid_t *uid) {
}
int sd_bus_get_owner_uid(sd_bus *bus, const char *name, uid_t *uid) {
- _cleanup_bus_message_unref_ sd_bus_message *
m = NULL, *
reply = NULL;
+ _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
uint32_t u;
int r;
uint32_t u;
int r;
@@
-202,21
+208,16
@@
int sd_bus_get_owner_uid(sd_bus *bus, const char *name, uid_t *uid) {
if (!uid)
return -EINVAL;
if (!uid)
return -EINVAL;
- r = sd_bus_
message_new_method_call
(
+ r = sd_bus_
call_method
(
bus,
"org.freedesktop.DBus",
"/",
"org.freedesktop.DBus",
"GetConnectionUnixUser",
bus,
"org.freedesktop.DBus",
"/",
"org.freedesktop.DBus",
"GetConnectionUnixUser",
- &m);
- if (r < 0)
- return r;
-
- r = sd_bus_message_append(m, "s", name);
- if (r < 0)
- return r;
-
- r = sd_bus_send_with_reply_and_block(bus, m, (uint64_t) -1, NULL, &reply);
+ NULL,
+ &reply,
+ "s",
+ name);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-229,7
+230,7
@@
int sd_bus_get_owner_uid(sd_bus *bus, const char *name, uid_t *uid) {
}
int sd_bus_get_owner_pid(sd_bus *bus, const char *name, pid_t *pid) {
}
int sd_bus_get_owner_pid(sd_bus *bus, const char *name, pid_t *pid) {
- _cleanup_bus_message_unref_ sd_bus_message *
m = NULL, *
reply = NULL;
+ _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
uint32_t u;
int r;
uint32_t u;
int r;
@@
-240,21
+241,16
@@
int sd_bus_get_owner_pid(sd_bus *bus, const char *name, pid_t *pid) {
if (!pid)
return -EINVAL;
if (!pid)
return -EINVAL;
- r = sd_bus_
message_new_method_call
(
+ r = sd_bus_
call_method
(
bus,
"org.freedesktop.DBus",
"/",
"org.freedesktop.DBus",
bus,
"org.freedesktop.DBus",
"/",
"org.freedesktop.DBus",
- "GetConnectionUnixUser",
- &m);
- if (r < 0)
- return r;
-
- r = sd_bus_message_append(m, "s", name);
- if (r < 0)
- return r;
-
- r = sd_bus_send_with_reply_and_block(bus, m, (uint64_t) -1, NULL, &reply);
+ "GetConnectionUnixProcessID",
+ NULL,
+ &reply,
+ "s",
+ name);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-269,54
+265,34
@@
int sd_bus_get_owner_pid(sd_bus *bus, const char *name, pid_t *pid) {
return 0;
}
return 0;
}
-int sd_bus_add_match(sd_bus *bus, const char *match) {
- _cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL;
- int r;
-
- if (!bus)
- return -EINVAL;
- if (!match)
- return -EINVAL;
+int bus_add_match_internal(sd_bus *bus, const char *match) {
+ assert(bus);
+ assert(match);
- r
= sd_bus_message_new_method_call
(
+ r
eturn sd_bus_call_method
(
bus,
"org.freedesktop.DBus",
"/",
"org.freedesktop.DBus",
"AddMatch",
bus,
"org.freedesktop.DBus",
"/",
"org.freedesktop.DBus",
"AddMatch",
- &m);
- if (r < 0)
- return r;
-
- r = sd_bus_message_append(m, "s", match);
- if (r < 0)
- return r;
-
- return sd_bus_send_with_reply_and_block(bus, m, (uint64_t) -1, NULL, &reply);
+ NULL,
+ NULL,
+ "s",
+ match);
}
}
-int
sd_bus_remove_match
(sd_bus *bus, const char *match) {
-
_cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL
;
-
int r
;
+int
bus_remove_match_internal
(sd_bus *bus, const char *match) {
+
assert(bus)
;
+
assert(match)
;
- if (!bus)
- return -EINVAL;
- if (!match)
- return -EINVAL;
-
- r = sd_bus_message_new_method_call(
+ return sd_bus_call_method(
bus,
"org.freedesktop.DBus",
"/",
"org.freedesktop.DBus",
"RemoveMatch",
bus,
"org.freedesktop.DBus",
"/",
"org.freedesktop.DBus",
"RemoveMatch",
- &m);
- if (r < 0)
- return r;
-
- r = sd_bus_message_append(m, "s", match);
- if (r < 0)
- return r;
-
- return sd_bus_send_with_reply_and_block(bus, m, (uint64_t) -1, NULL, &reply);
+ NULL,
+ NULL,
+ "s",
+ match);
}
}