From 0fea2203dc9a008208933a07dae56698c66f91bd Mon Sep 17 00:00:00 2001 From: Ariel Abreu Date: Mon, 24 Jan 2022 20:58:47 -0500 Subject: [PATCH] rm: Port to LibMain --- Userland/Utilities/CMakeLists.txt | 1 + Userland/Utilities/rm.cpp | 13 ++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Userland/Utilities/CMakeLists.txt b/Userland/Utilities/CMakeLists.txt index 4547c166a5..6ea83dba85 100644 --- a/Userland/Utilities/CMakeLists.txt +++ b/Userland/Utilities/CMakeLists.txt @@ -149,6 +149,7 @@ target_link_libraries(pro LibMain LibProtocol) target_link_libraries(ps LibMain) target_link_libraries(pwd LibMain) target_link_libraries(rev LibMain) +target_link_libraries(rm LibMain) target_link_libraries(run-tests LibRegex) target_link_libraries(shot LibGUI) target_link_libraries(shuf LibMain) diff --git a/Userland/Utilities/rm.cpp b/Userland/Utilities/rm.cpp index 8b6cb0a8e1..dd05c0719d 100644 --- a/Userland/Utilities/rm.cpp +++ b/Userland/Utilities/rm.cpp @@ -8,15 +8,14 @@ #include #include #include +#include +#include #include #include -int main(int argc, char** argv) +ErrorOr serenity_main(Main::Arguments arguments) { - if (pledge("stdio rpath cpath", nullptr) < 0) { - perror("pledge"); - return 1; - } + TRY(Core::System::pledge("stdio rpath cpath")); bool recursive = false; bool force = false; @@ -30,10 +29,10 @@ int main(int argc, char** argv) args_parser.add_option(verbose, "Verbose", "verbose", 'v'); args_parser.add_option(no_preserve_root, "Do not consider '/' specially", "no-preserve-root", 0); args_parser.add_positional_argument(paths, "Path(s) to remove", "path", Core::ArgsParser::Required::No); - args_parser.parse(argc, argv); + args_parser.parse(arguments); if (!force && paths.is_empty()) { - args_parser.print_usage(stderr, argv[0]); + args_parser.print_usage(stderr, arguments.argv[0]); return 1; }