X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbusctl.c;h=7649be29f46907f1ad84194d8437866fc0034de1;hb=32f464809e8e487739fde53a2feb0afba70c8db7;hp=b9b3305e93b58f96406475d5da965677789c1fd2;hpb=2b5c5383e48137d748681645ad7176f02b50ba30;p=elogind.git diff --git a/src/libsystemd-bus/busctl.c b/src/libsystemd-bus/busctl.c index b9b3305e9..7649be29f 100644 --- a/src/libsystemd-bus/busctl.c +++ b/src/libsystemd-bus/busctl.c @@ -36,6 +36,7 @@ static bool arg_no_pager = false; static char *arg_address = NULL; static bool arg_no_unique = false; +static bool arg_no_machine = false; static char **arg_matches = NULL; static BusTransport arg_transport = BUS_TRANSPORT_LOCAL; static char *arg_host = NULL; @@ -71,64 +72,83 @@ static int list_bus_names(sd_bus *bus, char **argv) { STRV_FOREACH(i, l) max_i = MAX(max_i, strlen(*i)); - printf("%-*s %*s %-*s %-*s %-*s MACHINE\n", + printf("%-*s %*s %-*s %-*s %-*s", (int) max_i, "NAME", 10, "PID", 15, "PROCESS", 16, "USER", 20, "CONNECTION"); + if (!arg_no_machine) + puts(" MACHINE"); + else + putchar('\n'); + STRV_FOREACH(i, l) { + _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL; _cleanup_free_ char *owner = NULL; sd_id128_t mid; - pid_t pid; - uid_t uid; if (arg_no_unique && (*i)[0] == ':') continue; + /* Skip the bus driver */ + if (streq(*i, "org.freedesktop.DBus")) + continue; + printf("%-*s", (int) max_i, *i); - r = sd_bus_get_owner_pid(bus, *i, &pid); + r = sd_bus_get_owner(bus, *i, SD_BUS_CREDS_UID|SD_BUS_CREDS_PID|SD_BUS_CREDS_COMM, &owner, &creds); if (r >= 0) { - _cleanup_free_ char *comm = NULL; + pid_t pid; + uid_t uid; - printf(" %10lu", (unsigned long) pid); + r = sd_bus_creds_get_pid(creds, &pid); + if (r >= 0) { + const char *comm = NULL; - get_process_comm(pid, &comm); - printf(" %-15s", strna(comm)); - } else - printf(" - - "); + sd_bus_creds_get_comm(creds, &comm); - r = sd_bus_get_owner_uid(bus, *i, &uid); - if (r >= 0) { - _cleanup_free_ char *u = NULL; + printf(" %10lu %-15s", (unsigned long) pid, strna(comm)); + } else + fputs(" - - ", stdout); - u = uid_to_name(uid); - if (!u) - return log_oom(); + r = sd_bus_creds_get_uid(creds, &uid); + if (r >= 0) { + _cleanup_free_ char *u = NULL; - if (strlen(u) > 16) - u[16] = 0; + u = uid_to_name(uid); + if (!u) + return log_oom(); - printf(" %-16s", u); - } else - printf(" - "); + if (strlen(u) > 16) + u[16] = 0; - r = sd_bus_get_owner(bus, *i, &owner); - if (r >= 0) - printf(" %-20s", owner); - else - printf(" - "); + printf(" %-16s", u); + } else + fputs(" - ", stdout); + + if (owner) + printf(" %-20s", owner); + else + fputs(" - ", stdout); - r = sd_bus_get_owner_machine_id(bus, *i, &mid); - if (r >= 0) { - char m[SD_ID128_STRING_MAX]; - printf(" %s\n", sd_id128_to_string(mid, m)); } else - printf(" -\n"); + printf(" - - - - "); + + if (arg_no_machine) + putchar('\n'); + else { + r = sd_bus_get_owner_machine_id(bus, *i, &mid); + if (r >= 0) { + char m[SD_ID128_STRING_MAX]; + printf(" %s\n", sd_id128_to_string(mid, m)); + } else + puts(" -"); + } } return 0; } static int monitor(sd_bus *bus, char *argv[]) { + bool added_something = false; char **i; int r; @@ -149,6 +169,8 @@ static int monitor(sd_bus *bus, char *argv[]) { log_error("Failed to add match: %s", strerror(-r)); return r; } + + added_something = true; } STRV_FOREACH(i, arg_matches) { @@ -157,6 +179,16 @@ static int monitor(sd_bus *bus, char *argv[]) { log_error("Failed to add match: %s", strerror(-r)); return r; } + + added_something = true; + } + + if (!added_something) { + r = sd_bus_add_match(bus, "", NULL, NULL); + if (r < 0) { + log_error("Failed to add match: %s", strerror(-r)); + return r; + } } for (;;) { @@ -199,6 +231,7 @@ static int help(void) { " -M --machine=CONTAINER Operate on local container\n" " --address=ADDRESS Connect to bus specified by address\n" " --no-unique Only show well-known names\n" + " --no-machine Don't show machine ID column in list\n" " --match=MATCH Only show matching messages\n\n" "Commands:\n" " list List bus names\n" @@ -217,20 +250,22 @@ static int parse_argv(int argc, char *argv[]) { ARG_USER, ARG_ADDRESS, ARG_MATCH, - ARG_NO_UNIQUE + ARG_NO_UNIQUE, + ARG_NO_MACHINE, }; static const struct option options[] = { - { "help", no_argument, NULL, 'h' }, - { "version", no_argument, NULL, ARG_VERSION }, - { "no-pager", no_argument, NULL, ARG_NO_PAGER }, - { "system", no_argument, NULL, ARG_SYSTEM }, - { "user", no_argument, NULL, ARG_USER }, - { "address", required_argument, NULL, ARG_ADDRESS }, - { "no-unique", no_argument, NULL, ARG_NO_UNIQUE }, - { "match", required_argument, NULL, ARG_MATCH }, - { "host", required_argument, NULL, 'H' }, - { "machine", required_argument, NULL, 'M' }, + { "help", no_argument, NULL, 'h' }, + { "version", no_argument, NULL, ARG_VERSION }, + { "no-pager", no_argument, NULL, ARG_NO_PAGER }, + { "system", no_argument, NULL, ARG_SYSTEM }, + { "user", no_argument, NULL, ARG_USER }, + { "address", required_argument, NULL, ARG_ADDRESS }, + { "no-unique", no_argument, NULL, ARG_NO_UNIQUE }, + { "no-machine", no_argument, NULL, ARG_NO_MACHINE }, + { "match", required_argument, NULL, ARG_MATCH }, + { "host", required_argument, NULL, 'H' }, + { "machine", required_argument, NULL, 'M' }, {}, }; @@ -271,6 +306,10 @@ static int parse_argv(int argc, char *argv[]) { arg_no_unique = true; break; + case ARG_NO_MACHINE: + arg_no_machine = true; + break; + case ARG_MATCH: if (strv_extend(&arg_matches, optarg) < 0) return log_oom();