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

pidof: Port to LibMain

Browse source 
Use pledge/unveil to allow access only to required paths and syscalls.
This commit is contained in:
Riccardo Arena 2022-02-08 23:21:18 +01:00 • committed by Linus Groh
parent a78058bc79
commit 5c63537ae9
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Userland/Utilities/CMakeLists.txt
View file

@ -147,6 +147,7 @@ target_link_libraries(pape LibGUI LibMain)
target_link_libraries(passwd LibCrypt LibMain) target_link_libraries(passwd LibCrypt LibMain)
target_link_libraries(paste LibGUI) target_link_libraries(paste LibGUI)
target_link_libraries(pgrep LibRegex) target_link_libraries(pgrep LibRegex)
target_link_libraries(pidof LibMain)
target_link_libraries(ping LibMain) target_link_libraries(ping LibMain)
target_link_libraries(pls LibCrypt LibMain) target_link_libraries(pls LibCrypt LibMain)
target_link_libraries(pmap LibMain) target_link_libraries(pmap LibMain)

15
Userland/Utilities/pidof.cpp
View file

@ -7,12 +7,14 @@
#include <AK/String.h> #include <AK/String.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/ProcessStatisticsReader.h> #include <LibCore/ProcessStatisticsReader.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
static int pid_of(const String& process_name, bool single_shot, bool omit_pid, pid_t pid) static ErrorOr<int> pid_of(const String& process_name, bool single_shot, bool omit_pid, pid_t pid)
{ {
bool displayed_at_least_one = false; bool displayed_at_least_one = false;
@ -38,8 +40,13 @@ static int pid_of(const String& process_name, bool single_shot, bool omit_pid, p
return 0; return 0;
} }
int main(int argc, char** argv) ErrorOr<int> serenity_main(Main::Arguments args)
{ {
TRY(Core::System::pledge("stdio rpath"));
TRY(Core::System::unveil("/proc/all", "r"));
TRY(Core::System::unveil("/etc/passwd", "r"));
TRY(Core::System::unveil(nullptr, nullptr));
bool single_shot = false; bool single_shot = false;
const char* omit_pid_value = nullptr; const char* omit_pid_value = nullptr;
const char* process_name = nullptr; const char* process_name = nullptr;
@ -49,7 +56,7 @@ int main(int argc, char** argv)
args_parser.add_option(omit_pid_value, "Omit the given PID, or the parent process if the special value %PPID is passed", nullptr, 'o', "pid"); args_parser.add_option(omit_pid_value, "Omit the given PID, or the parent process if the special value %PPID is passed", nullptr, 'o', "pid");
args_parser.add_positional_argument(process_name, "Process name to search for", "process-name"); args_parser.add_positional_argument(process_name, "Process name to search for", "process-name");
args_parser.parse(argc, argv); args_parser.parse(args);
pid_t pid_to_omit = 0; pid_t pid_to_omit = 0;
if (omit_pid_value) { if (omit_pid_value) {
@ -59,7 +66,7 @@ int main(int argc, char** argv)
auto number = StringView(omit_pid_value).to_uint(); auto number = StringView(omit_pid_value).to_uint();
if (!number.has_value()) { if (!number.has_value()) {
warnln("Invalid value for -o"); warnln("Invalid value for -o");
args_parser.print_usage(stderr, argv[0]); args_parser.print_usage(stderr, args.argv[0]);
return 1; return 1;
} }
pid_to_omit = number.value(); pid_to_omit = number.value();