mirror of
https://github.com/AuxXxilium/eudev.git
synced 2024-12-25 03:49:00 +07:00
dbus: complete coverage for path units
This commit is contained in:
parent
48220598fe
commit
ebf57b80c3
@ -28,7 +28,8 @@
|
||||
#define BUS_PATH_INTERFACE \
|
||||
" <interface name=\"org.freedesktop.systemd1.Path\">\n" \
|
||||
" <property name=\"Unit\" type=\"s\" access=\"read\"/>\n" \
|
||||
" </interface>\n" \
|
||||
" <property name=\"Paths\" type=\"a(ss)\" access=\"read\"/>\n" \
|
||||
" </interface>\n"
|
||||
|
||||
#define INTROSPECTION \
|
||||
DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE \
|
||||
@ -41,10 +42,40 @@
|
||||
|
||||
const char bus_path_interface[] = BUS_PATH_INTERFACE;
|
||||
|
||||
static int bus_path_append_paths(Manager *m, DBusMessageIter *i, const char *property, void *data) {
|
||||
Path *p = data;
|
||||
DBusMessageIter sub, sub2;
|
||||
PathSpec *k;
|
||||
|
||||
assert(m);
|
||||
assert(i);
|
||||
assert(property);
|
||||
assert(p);
|
||||
|
||||
if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "(ss)", &sub))
|
||||
return -ENOMEM;
|
||||
|
||||
LIST_FOREACH(spec, k, p->specs) {
|
||||
const char *t = path_type_to_string(k->type);
|
||||
|
||||
if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_STRUCT, NULL, &sub2) ||
|
||||
!dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &t) ||
|
||||
!dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &k->path) ||
|
||||
!dbus_message_iter_close_container(&sub, &sub2))
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
if (!dbus_message_iter_close_container(i, &sub))
|
||||
return -ENOMEM;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
DBusHandlerResult bus_path_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
|
||||
const BusProperty properties[] = {
|
||||
BUS_UNIT_PROPERTIES,
|
||||
{ "org.freedesktop.systemd1.Path", "Unit", bus_property_append_string, "s", &u->path.unit->meta.id },
|
||||
{ "org.freedesktop.systemd1.Path", "Unit", bus_property_append_string, "s", u->path.unit->meta.id },
|
||||
{ "org.freedesktop.systemd1.Path", "Paths", bus_path_append_paths, "a(ss)", u },
|
||||
{ NULL, NULL, NULL, NULL, NULL }
|
||||
};
|
||||
|
||||
|
@ -1059,7 +1059,7 @@ static int print_property(const char *name, DBusMessageIter *iter) {
|
||||
DBusMessageIter sub;
|
||||
dbus_message_iter_recurse(iter, &sub);
|
||||
|
||||
if (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_UINT32 && strstr(name, "Job")) {
|
||||
if (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_UINT32 && streq(name, "Job")) {
|
||||
uint32_t u;
|
||||
|
||||
dbus_message_iter_get_basic(&sub, &u);
|
||||
@ -1070,7 +1070,7 @@ static int print_property(const char *name, DBusMessageIter *iter) {
|
||||
printf("%s=\n", name);
|
||||
|
||||
return 0;
|
||||
} else if (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_STRING && strstr(name, "Unit")) {
|
||||
} else if (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_STRING && streq(name, "Unit")) {
|
||||
const char *s;
|
||||
|
||||
dbus_message_iter_get_basic(&sub, &s);
|
||||
@ -1110,6 +1110,25 @@ static int print_property(const char *name, DBusMessageIter *iter) {
|
||||
puts("");
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
} else if (dbus_message_iter_get_element_type(iter) == DBUS_TYPE_STRUCT && streq(name, "Paths")) {
|
||||
DBusMessageIter sub, sub2;
|
||||
|
||||
dbus_message_iter_recurse(iter, &sub);
|
||||
|
||||
while (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_STRUCT) {
|
||||
const char *type, *path;
|
||||
|
||||
dbus_message_iter_recurse(&sub, &sub2);
|
||||
|
||||
if (bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &type, true) >= 0 &&
|
||||
bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &path, false) >= 0)
|
||||
printf("%s=%s\n", type, path);
|
||||
|
||||
dbus_message_iter_next(&sub);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user