RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 09:04:59 +00:00
Code Issues Activity Actions

pkill: Add -U option to filter matches by UID or login name

Browse source
This commit is contained in:
Tim Ledbetter 2023-06-04 11:34:20 +01:00 • committed by Andreas Kling
parent caa7edff92
commit a253be6abf
1 changed files with 31 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Userland/Utilities/pkill.cpp
View file

@ -7,6 +7,7 @@
#include <AK/Format.h>
#include <AK/Vector.h>
#include <LibCore/Account.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/ProcessStatisticsReader.h>
#include <LibCore/System.h>
@ -20,6 +21,7 @@ ErrorOr<int> serenity_main(Main::Arguments args)
{
TRY(Core::System::pledge("stdio proc rpath"));
TRY(Core::System::unveil("/sys/kernel/processes", "r"));
TRY(Core::System::unveil("/etc/group", "r"));
TRY(Core::System::unveil("/etc/passwd", "r"));
TRY(Core::System::unveil(nullptr, nullptr));
@ -27,13 +29,38 @@ ErrorOr<int> serenity_main(Main::Arguments args)
bool case_insensitive = false;
bool echo = false;
StringView pattern;
HashTable<uid_t> uids_to_filter_by;
int signal = SIGTERM;
Core::ArgsParser args_parser;
args_parser.add_option(display_number_of_matches, "Print the number of matching processes", "count", 'c');
args_parser.add_option(display_number_of_matches, "Display the number of matching processes", "count", 'c');
args_parser.add_option(case_insensitive, "Make matches case-insensitive", nullptr, 'i');
args_parser.add_option(echo, "Display what is killed", "echo", 'e');
args_parser.add_option(signal, "Signal number to send", "signal", 's', "number");
args_parser.add_option(Core::ArgsParser::Option {
.argument_mode = Core::ArgsParser::OptionArgumentMode::Required,
.help_string = "Select only processes whose UID is in the given comma-separated list. Login name or numerical user ID may be used",
.long_name = "uid",
.short_name = 'U',
.value_name = "uid-list",
.accept_value = [&uids_to_filter_by](StringView comma_separated_users) {
for (auto user_string : comma_separated_users.split_view(',')) {
auto maybe_uid = user_string.to_uint<uid_t>();
if (maybe_uid.has_value()) {
uids_to_filter_by.set(maybe_uid.value());
} else {
auto maybe_account = Core::Account::from_name(user_string, Core::Account::Read::PasswdOnly);
if (maybe_account.is_error()) {
warnln("Could not find user '{}': {}", user_string, maybe_account.error());
return false;
}
uids_to_filter_by.set(maybe_account.release_value().uid());
}
}
return true;
},
});
args_parser.add_positional_argument(pattern, "Process name to search for", "process-name");
args_parser.parse(args);
@ -53,6 +80,9 @@ ErrorOr<int> serenity_main(Main::Arguments args)
for (auto& process : all_processes.processes) {
auto result = re.match(process.name, PosixFlags::Global);
if (result.success) {
if (!uids_to_filter_by.is_empty() && !uids_to_filter_by.contains(process.uid))
continue;
matched_processes.append(process);
}
}