diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-04-24 12:56:47 -0300 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-04-24 19:02:12 -0300 |
| commit | 391a4f72422ab18c0a6b5f291fa47f8d606b9e14 (patch) | |
| tree | 66bcd89543341ee21ed9afa17b2ae69775fd638e | |
| parent | 1f8497905d7a60c5bf098039a971deb1b52cef09 (diff) | |
inhbit: show comm field of inhibiting processes
| -rw-r--r-- | src/login/inhibit.c | 8 | ||||
| -rw-r--r-- | src/login/loginctl.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/login/inhibit.c b/src/login/inhibit.c index fe108c6ef..29e50c144 100644 --- a/src/login/inhibit.c +++ b/src/login/inhibit.c @@ -96,6 +96,7 @@ static int print_inhibitors(DBusConnection *bus, DBusError *error) { dbus_message_iter_recurse(&iter, &sub); while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) { const char *what, *who, *why, *mode; + _cleanup_free_ char *comm = NULL, *u = NULL; dbus_uint32_t uid, pid; if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRUCT) @@ -111,11 +112,14 @@ static int print_inhibitors(DBusConnection *bus, DBusError *error) { bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_UINT32, &pid, false) < 0) return -EIO; - printf(" Who: %s (UID %lu, PID %lu)\n" + get_process_comm(pid, &comm); + u = uid_to_name(uid); + + printf(" Who: %s (UID %lu/%s, PID %lu/%s)\n" " What: %s\n" " Why: %s\n" " Mode: %s\n\n", - who, (unsigned long) uid, (unsigned long) pid, + who, (unsigned long) uid, strna(u), (unsigned long) pid, strna(comm), what, why, mode); diff --git a/src/login/loginctl.c b/src/login/loginctl.c index 36c65bc8d..caaea8dfa 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -1296,7 +1296,7 @@ static int help(void) { " -p --property=NAME Show only properties by this name\n" " -a --all Show all properties, including empty ones\n" " --kill-who=WHO Who to send signal to\n" - " --full Do not ellipsize output\n" + " --full Do not ellipsize output\n" " -s --signal=SIGNAL Which signal to send\n" " --no-ask-password Don't prompt for password\n" " -H --host=[USER@]HOST Show information for remote host\n" |