diff --git a/Userland/Utilities/CMakeLists.txt b/Userland/Utilities/CMakeLists.txt index 5b5ea7d464..4dbcf0da44 100644 --- a/Userland/Utilities/CMakeLists.txt +++ b/Userland/Utilities/CMakeLists.txt @@ -123,6 +123,7 @@ target_link_libraries(ln LibMain) target_link_libraries(logout LibMain) target_link_libraries(ls LibMain) target_link_libraries(lsirq LibMain) +target_link_libraries(lsof LibMain) target_link_libraries(lspci LibPCIDB LibMain) target_link_libraries(lsusb LibUSBDB LibMain) target_link_libraries(man LibMarkdown LibMain) diff --git a/Userland/Utilities/lsof.cpp b/Userland/Utilities/lsof.cpp index ab6fd4f1c4..f799ae750b 100644 --- a/Userland/Utilities/lsof.cpp +++ b/Userland/Utilities/lsof.cpp @@ -4,17 +4,17 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include #include #include #include -#include #include #include #include #include #include #include +#include +#include #include #include @@ -99,25 +99,14 @@ static void display_entry(const OpenFile& file, const Core::ProcessStatistics& s outln("{:28} {:>4} {:>4} {:10} {:>4} {}", statistics.name, file.pid, statistics.pgid, statistics.username, file.fd, file.full_name); } -int main(int argc, char* argv[]) +ErrorOr serenity_main(Main::Arguments arguments) { - if (pledge("stdio rpath proc", nullptr) < 0) { - perror("pledge"); - return 1; - } - - if (unveil("/proc", "r") < 0) { - perror("unveil /proc"); - return 1; - } + TRY(Core::System::pledge("stdio rpath proc")); + TRY(Core::System::unveil("/proc", "r")); // needed by ProcessStatisticsReader::get_all() - if (unveil("/etc/passwd", "r") < 0) { - perror("unveil /etc/passwd"); - return 1; - } - - unveil(nullptr, nullptr); + TRY(Core::System::unveil("/etc/passwd", "r")); + TRY(Core::System::unveil(nullptr, nullptr)); bool arg_all_processes { false }; int arg_fd { -1 }; @@ -127,7 +116,7 @@ int main(int argc, char* argv[]) pid_t arg_pid { -1 }; const char* arg_filename { nullptr }; - if (argc == 1) + if (arguments.strings.size() == 1) arg_all_processes = true; else { Core::ArgsParser parser; @@ -137,7 +126,7 @@ int main(int argc, char* argv[]) parser.add_option(arg_uid, "Select by login/UID", nullptr, 'u', "login/UID"); parser.add_option(arg_pgid, "Select by process group ID", nullptr, 'g', "PGID"); parser.add_positional_argument(arg_filename, "Filename", "filename", Core::ArgsParser::Required::No); - parser.parse(argc, argv); + parser.parse(arguments); } { // try convert UID to int