X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbusctl.c;h=57bc83d1c19364f2d1082d6e45e0ec223e2cd9bc;hp=f1ae051c9b9833319cca275902825bdff8f9de73;hb=30caf8f3afd29da8507c0edbcead7935604c9f3e;hpb=95c4fe827195b47fad7cc87a3f84bf3af6b657c2

diff --git a/src/libsystemd-bus/busctl.c b/src/libsystemd-bus/busctl.c
index f1ae051c9..57bc83d1c 100644
--- a/src/libsystemd-bus/busctl.c
+++ b/src/libsystemd-bus/busctl.c
@@ -52,14 +52,14 @@ static void pager_open_if_enabled(void) {
 }
 
 static int list_bus_names(sd_bus *bus, char **argv) {
-        _cleanup_strv_free_ char **l = NULL;
+        _cleanup_strv_free_ char **acquired = NULL, **activatable = NULL;
         char **i;
         int r;
         size_t max_i = 0;
 
         assert(bus);
 
-        r = sd_bus_list_names(bus, &l);
+        r = sd_bus_list_names(bus, &acquired, &activatable);
         if (r < 0) {
                 log_error("Failed to list names: %s", strerror(-r));
                 return r;
@@ -67,9 +67,13 @@ static int list_bus_names(sd_bus *bus, char **argv) {
 
         pager_open_if_enabled();
 
-        strv_sort(l);
+        strv_sort(acquired);
+        strv_sort(activatable);
 
-        STRV_FOREACH(i, l)
+        STRV_FOREACH(i, acquired)
+                max_i = MAX(max_i, strlen(*i));
+
+        STRV_FOREACH(i, activatable)
                 max_i = MAX(max_i, strlen(*i));
 
         printf("%-*s %*s %-*s %-*s %-*s",
@@ -80,7 +84,24 @@ static int list_bus_names(sd_bus *bus, char **argv) {
         else
                 putchar('\n');
 
-        STRV_FOREACH(i, l) {
+        STRV_FOREACH(i, activatable) {
+
+                /* Skip the bus driver */
+                if (streq(*i, "org.freedesktop.DBus"))
+                        continue;
+
+                if (strv_contains(acquired, *i))
+                        continue;
+
+                printf("%-*s", (int) max_i, *i);
+                printf("          - -               -                (activation)        ");
+                if (arg_no_machine)
+                        putchar('\n');
+                else
+                        puts(" -");
+        }
+
+        STRV_FOREACH(i, acquired) {
                 _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL;
                 sd_id128_t mid;
 
@@ -261,7 +282,9 @@ static int help(void) {
                "     --match=MATCH        Only show matching messages\n\n"
                "Commands:\n"
                "  list                    List bus names\n"
-               "  monitor [SERVICE...]    Show bus traffic\n",
+               "  monitor [SERVICE...]    Show bus traffic\n"
+               "  status ENDPOINT         Show endpoint status\n"
+               "  help                    Show this help\n",
                program_invocation_short_name);
 
         return 0;