dbus: complete coverage for path units

[elogind.git] / src / systemctl.c

diff --git a/src/systemctl.c b/src/systemctl.c
index b66901b9ed2a073ae72345c098a5e4c8401c14aa..63d5d9cd9f3fae168de878955becde144f38d35d 100644 (file)
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -1059,7 +1059,7 @@ static int print_property(const char *name, DBusMessageIter *iter) {
                 DBusMessageIter sub;
                 dbus_message_iter_recurse(iter, &sub);
 
                 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);
                         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;
                                 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);
                         const char *s;
 
                         dbus_message_iter_get_basic(&sub, &s);


@@ -1110,6 +1110,25 @@ static int print_property(const char *name, DBusMessageIter *iter) {
                                 puts("");
                         }
 
                                 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;
                 }
 
                         return 0;
                 }