RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 00:47:45 +00:00
Code Issues Activity Actions

Utilities/w: Convert TTY string from /var/run/utmp to TTY pseudo name

Browse source 
Previously, we were comparing the "tty" value from
`/sys/kernel/processes` to the TTY value from
`/var/run/utmp` directly.  This caused the "WHAT" column to always show
"N/A", because the former is the TTY pseudo name, while the latter is
the full device name.
This commit is contained in:
Tim Ledbetter 2023-05-23 22:10:06 +01:00 • committed by Andreas Kling
parent 826894a89c
commit 2dbc7e4fff
1 changed files with 25 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Userland/Utilities/w.cpp
View file

@ -15,6 +15,23 @@
#include <LibCore/ProcessStatisticsReader.h> #include <LibCore/ProcessStatisticsReader.h>
#include <LibCore/System.h> #include <LibCore/System.h>
#include <LibMain/Main.h> #include <LibMain/Main.h>
#include <sys/sysmacros.h>
static ErrorOr<String> tty_stat_to_pseudo_name(struct stat const& tty_stat)
{
int tty_device_major = major(tty_stat.st_rdev);
int tty_device_minor = minor(tty_stat.st_rdev);
if (tty_device_major == 201) {
return String::formatted("pts:{}", tty_device_minor);
}
if (tty_device_major == 4) {
return String::formatted("tty:{}", tty_device_minor);
}
return Error::from_string_literal("Unknown TTY device type");
}
ErrorOr<int> serenity_main(Main::Arguments) ErrorOr<int> serenity_main(Main::Arguments)
{ {
@ -57,6 +74,7 @@ ErrorOr<int> serenity_main(Main::Arguments)
StringBuilder builder; StringBuilder builder;
String idle_string = "n/a"_short_string; String idle_string = "n/a"_short_string;
String what = "n/a"_short_string;
auto maybe_stat = Core::System::stat(tty); auto maybe_stat = Core::System::stat(tty);
if (!maybe_stat.is_error()) { if (!maybe_stat.is_error()) {
auto stat = maybe_stat.release_value(); auto stat = maybe_stat.release_value();
@ -65,13 +83,14 @@ ErrorOr<int> serenity_main(Main::Arguments)
builder.appendff("{}s", idle_time); builder.appendff("{}s", idle_time);
idle_string = TRY(builder.to_string()); idle_string = TRY(builder.to_string());
} }
}
String what = "n/a"_short_string;
auto tty_pseudo_name = TRY(tty_stat_to_pseudo_name(stat));
for (auto& process : process_statistics.processes) { for (auto& process : process_statistics.processes) {
if (process.tty == tty && process.pid == process.pgid) if (tty_pseudo_name == process.tty.view() && process.pid == process.pgid) {
what = TRY(String::from_deprecated_string(process.name)); what = TRY(String::from_deprecated_string(process.name));
break;
}
}
} }
outln("{:10} {:12} {:16} {:6} {}", username, tty, login_at, idle_string, what); outln("{:10} {:12} {:16} {:6} {}", username, tty, login_at, idle_string, what);