From 4e02b204efc5e63ca109ee59125febfbd173e6b2 Mon Sep 17 00:00:00 2001 From: Michel Hermier Date: Thu, 20 Jan 2022 22:07:26 +0100 Subject: [PATCH] rev: Port to LibMain --- Userland/Utilities/CMakeLists.txt | 1 + Userland/Utilities/rev.cpp | 16 ++++++---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Userland/Utilities/CMakeLists.txt b/Userland/Utilities/CMakeLists.txt index 0dd3e06f47..0da531fca6 100644 --- a/Userland/Utilities/CMakeLists.txt +++ b/Userland/Utilities/CMakeLists.txt @@ -144,6 +144,7 @@ target_link_libraries(pmemdump LibMain) target_link_libraries(pro LibMain LibProtocol) target_link_libraries(ps LibMain) target_link_libraries(pwd LibMain) +target_link_libraries(rev LibMain) target_link_libraries(run-tests LibRegex) target_link_libraries(shot LibGUI) target_link_libraries(sql LibLine LibSQL LibIPC) diff --git a/Userland/Utilities/rev.cpp b/Userland/Utilities/rev.cpp index 5fb4498ad7..b2d3225c17 100644 --- a/Userland/Utilities/rev.cpp +++ b/Userland/Utilities/rev.cpp @@ -5,23 +5,22 @@ */ #include +#include +#include #include #include #include -int main(int argc, char** argv) +ErrorOr serenity_main(Main::Arguments arguments) { - if (pledge("stdio rpath", nullptr) < 0) { - perror("pledge"); - return 1; - } + TRY(Core::System::pledge("stdio rpath"sv)); Vector paths; Core::ArgsParser args_parser; args_parser.set_general_help("Concatente files to stdout with each line in reverse."); args_parser.add_positional_argument(paths, "File path", "path", Core::ArgsParser::Required::No); - args_parser.parse(argc, argv); + args_parser.parse(arguments); Vector streams; auto num_paths = paths.size(); @@ -49,10 +48,7 @@ int main(int argc, char** argv) } }; - if (pledge("stdio", nullptr) < 0) { - perror("pledge"); - return 1; - } + TRY(Core::System::pledge("stdio"sv)); for (auto* stream : streams) { for (;;) {