From d2ec82d4f98ce4e1afbc2cb163f83a0b91a1372f Mon Sep 17 00:00:00 2001 From: Tim Ledbetter Date: Tue, 23 May 2023 22:10:15 +0100 Subject: [PATCH] Utilities/w: Display the TTY pseudo name in the "TTY" column This matches the format used by `ps`. If we cannot determine the TTY pseudo name we fall back to the full device name, as shown previously. --- Userland/Utilities/w.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Userland/Utilities/w.cpp b/Userland/Utilities/w.cpp index 71c53d3c8c..04f2fa5fcb 100644 --- a/Userland/Utilities/w.cpp +++ b/Userland/Utilities/w.cpp @@ -75,6 +75,7 @@ ErrorOr serenity_main(Main::Arguments) StringBuilder builder; String idle_string = "n/a"_short_string; String what = "n/a"_short_string; + StringView tty_display_name = tty; auto maybe_stat = Core::System::stat(tty); if (!maybe_stat.is_error()) { auto stat = maybe_stat.release_value(); @@ -85,6 +86,7 @@ ErrorOr serenity_main(Main::Arguments) } auto tty_pseudo_name = TRY(tty_stat_to_pseudo_name(stat)); + tty_display_name = tty_pseudo_name; for (auto& process : process_statistics.processes) { if (tty_pseudo_name == process.tty.view() && process.pid == process.pgid) { what = TRY(String::from_deprecated_string(process.name)); @@ -93,7 +95,7 @@ ErrorOr serenity_main(Main::Arguments) } } - outln("{:10} {:12} {:16} {:6} {}", username, tty, login_at, idle_string, what); + outln("{:10} {:12} {:16} {:6} {}", username, tty_display_name, login_at, idle_string, what); return {}; })); return 0;