chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
8d16209
)
busctl: show machine name of all registered names
author
Lennart Poettering
<lennart@poettering.net>
Mon, 11 Nov 2013 22:45:36 +0000
(23:45 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Mon, 11 Nov 2013 23:12:44 +0000
(
00:12
+0100)
src/libsystemd-bus/busctl.c
patch
|
blob
|
history
diff --git
a/src/libsystemd-bus/busctl.c
b/src/libsystemd-bus/busctl.c
index 088111cbce10648f0fa9dc73d8f3d6e80139d47f..d5ac2fe0f2a81ba8f4285a11c5a9eb64cd55755f 100644
(file)
--- a/
src/libsystemd-bus/busctl.c
+++ b/
src/libsystemd-bus/busctl.c
@@
-70,11
+70,12
@@
static int list_bus_names(sd_bus *bus, char **argv) {
STRV_FOREACH(i, l)
max_i = MAX(max_i, strlen(*i));
STRV_FOREACH(i, l)
max_i = MAX(max_i, strlen(*i));
- printf("%-*s %*s %-*s %-*s
CONNECTION
\n",
- (int) max_i, "NAME", 10, "PID", 15, "PROCESS", 16, "USER");
+ printf("%-*s %*s %-*s %-*s
%-*s MACHINE
\n",
+ (int) max_i, "NAME", 10, "PID", 15, "PROCESS", 16, "USER"
, 20, "CONNECTION"
);
STRV_FOREACH(i, l) {
_cleanup_free_ char *owner = NULL;
STRV_FOREACH(i, l) {
_cleanup_free_ char *owner = NULL;
+ sd_id128_t mid;
pid_t pid;
uid_t uid;
pid_t pid;
uid_t uid;
@@
-111,8
+112,15
@@
static int list_bus_names(sd_bus *bus, char **argv) {
r = sd_bus_get_owner(bus, *i, &owner);
if (r >= 0)
r = sd_bus_get_owner(bus, *i, &owner);
if (r >= 0)
- printf(" %
s\n
", owner);
+ printf(" %
-20s
", owner);
else
else
+ printf(" - ");
+
+ 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(" -\n");
}