From 507de4bc1da72b81948eb59edb9a22ff0a24cb3e Mon Sep 17 00:00:00 2001 From: Kenneth Myhra Date: Thu, 25 Nov 2021 20:35:36 +0100 Subject: [PATCH] cat: Port to LibMain :^) --- Userland/Utilities/CMakeLists.txt | 1 + Userland/Utilities/cat.cpp | 16 ++++++---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Userland/Utilities/CMakeLists.txt b/Userland/Utilities/CMakeLists.txt index 7923e2f232..e98b883cd4 100644 --- a/Userland/Utilities/CMakeLists.txt +++ b/Userland/Utilities/CMakeLists.txt @@ -57,6 +57,7 @@ target_link_libraries(asctl LibAudio) target_link_libraries(base64 LibMain) target_link_libraries(bt LibSymbolication) target_link_libraries(blockdev LibMain) +target_link_libraries(cat LibMain) target_link_libraries(checksum LibCrypto) target_link_libraries(chres LibGUI) target_link_libraries(cksum LibCrypto) diff --git a/Userland/Utilities/cat.cpp b/Userland/Utilities/cat.cpp index 59c203d70f..78b1043725 100644 --- a/Userland/Utilities/cat.cpp +++ b/Userland/Utilities/cat.cpp @@ -6,6 +6,8 @@ #include #include +#include +#include #include #include #include @@ -13,19 +15,16 @@ #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", nullptr)); Vector paths; Core::ArgsParser args_parser; args_parser.set_general_help("Concatenate files or pipes to stdout."); args_parser.add_positional_argument(paths, "File path", "path", Core::ArgsParser::Required::No); - args_parser.parse(argc, argv); + args_parser.parse(arguments); Vector fds; if (!paths.is_empty()) { @@ -43,10 +42,7 @@ int main(int argc, char** argv) fds.append(0); } - if (pledge("stdio", nullptr) < 0) { - perror("pledge"); - return 1; - } + TRY(Core::System::pledge("stdio", nullptr)); for (auto& fd : fds) { for (;;) {