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

pgrep: Add -n option to display the newest matching process only

Browse source
This commit is contained in:
Tim Ledbetter 2023-06-09 17:23:59 +01:00 • committed by Andreas Kling
parent f95dccdb45
commit 47b530fa71
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Base/usr/share/man/man1/pgrep.md
View file

@ -5,7 +5,7 @@ pgrep - look up processes based on name
## Synopsis ## Synopsis
```sh ```sh
$ pgrep [--count] [-d delimiter] [--ignore-case] [--list-name] [--uid uid-list] [--invert-match] [--exact] <process-name> $ pgrep [--count] [-d delimiter] [--ignore-case] [--list-name] [--newest] [--uid uid-list] [--invert-match] [--exact] <process-name>
``` ```
## Options ## Options
@ -14,6 +14,7 @@ $ pgrep [--count] [-d delimiter] [--ignore-case] [--list-name] [--uid uid-list]
* `-d`, `--delimiter`: Set the string used to delimit multiple pids * `-d`, `--delimiter`: Set the string used to delimit multiple pids
* `-i`, `--ignore-case`: Make matches case-insensitive * `-i`, `--ignore-case`: Make matches case-insensitive
* `-l`, `--list-name`: List the process name in addition to its pid * `-l`, `--list-name`: List the process name in addition to its pid
* `-n`, `--newest`: Select the most recently created process only
* `-U uid-list`, `--uid uid-list`: Select only processes whose UID is in the given comma-separated list. Login name or numerical user ID may be used * `-U uid-list`, `--uid uid-list`: Select only processes whose UID is in the given comma-separated list. Login name or numerical user ID may be used
* `-x`, `--exact`: Select only processes whose names match the given pattern exactly * `-x`, `--exact`: Select only processes whose names match the given pattern exactly
* `-v`, `--invert-match`: Select non-matching lines * `-v`, `--invert-match`: Select non-matching lines

11
Userland/Utilities/pgrep.cpp
View file

@ -28,6 +28,7 @@ ErrorOr<int> serenity_main(Main::Arguments args)
bool list_process_name = false; bool list_process_name = false;
bool invert_match = false; bool invert_match = false;
bool exact_match = false; bool exact_match = false;
bool newest_only = false;
HashTable<uid_t> uids_to_filter_by; HashTable<uid_t> uids_to_filter_by;
StringView pattern; StringView pattern;
@ -35,6 +36,7 @@ ErrorOr<int> serenity_main(Main::Arguments args)
args_parser.add_option(display_number_of_matches, "Suppress normal output and print the number of matching processes", "count", 'c'); args_parser.add_option(display_number_of_matches, "Suppress normal output and print the number of matching processes", "count", 'c');
args_parser.add_option(pid_delimiter, "Set the string used to delimit multiple pids", "delimiter", 'd', nullptr); args_parser.add_option(pid_delimiter, "Set the string used to delimit multiple pids", "delimiter", 'd', nullptr);
args_parser.add_option(case_insensitive, "Make matches case-insensitive", "ignore-case", 'i'); args_parser.add_option(case_insensitive, "Make matches case-insensitive", "ignore-case", 'i');
args_parser.add_option(newest_only, "Select the most recently created process only", "newest", 'n');
args_parser.add_option(list_process_name, "List the process name in addition to its pid", "list-name", 'l'); args_parser.add_option(list_process_name, "List the process name in addition to its pid", "list-name", 'l');
args_parser.add_option(Core::ArgsParser::Option { args_parser.add_option(Core::ArgsParser::Option {
.argument_mode = Core::ArgsParser::OptionArgumentMode::Required, .argument_mode = Core::ArgsParser::OptionArgumentMode::Required,
@ -95,8 +97,11 @@ ErrorOr<int> serenity_main(Main::Arguments args)
if (display_number_of_matches) { if (display_number_of_matches) {
outln("{}", matches.size()); outln("{}", matches.size());
} else { } else if (!matches.is_empty()) {
quick_sort(matches, [](auto const& a, auto const& b) { return a.pid < b.pid; }); quick_sort(matches, [](auto const& a, auto const& b) { return a.creation_time < b.creation_time; });
if (newest_only)
matches = { matches.last() };
auto displayed_at_least_one = false; auto displayed_at_least_one = false;
for (auto& match : matches) { for (auto& match : matches) {
if (displayed_at_least_one) if (displayed_at_least_one)
@ -114,5 +119,5 @@ ErrorOr<int> serenity_main(Main::Arguments args)
outln(); outln();
} }
return matches.size() > 0 ? 0 : 1; return matches.is_empty() ? 1 : 0;
} }