From d7336879d1992be8126267ed9d0282a1179e04d2 Mon Sep 17 00:00:00 2001 From: Kenneth Myhra Date: Thu, 25 Nov 2021 21:37:57 +0100 Subject: [PATCH] basename: Port to LibMain --- Userland/Utilities/CMakeLists.txt | 1 + Userland/Utilities/basename.cpp | 13 +++++-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Userland/Utilities/CMakeLists.txt b/Userland/Utilities/CMakeLists.txt index 8847e38664..4f61fc0a4a 100644 --- a/Userland/Utilities/CMakeLists.txt +++ b/Userland/Utilities/CMakeLists.txt @@ -55,6 +55,7 @@ target_link_libraries(aplay LibAudio) target_link_libraries(arp LibMain) target_link_libraries(asctl LibAudio) target_link_libraries(base64 LibMain) +target_link_libraries(basename LibMain) target_link_libraries(bt LibSymbolication) target_link_libraries(blockdev LibMain) target_link_libraries(cat LibMain) diff --git a/Userland/Utilities/basename.cpp b/Userland/Utilities/basename.cpp index fa2b480f1d..08b842ba22 100644 --- a/Userland/Utilities/basename.cpp +++ b/Userland/Utilities/basename.cpp @@ -6,15 +6,12 @@ #include #include -#include -#include +#include +#include -int main(int argc, char** argv) +ErrorOr serenity_main(Main::Arguments arguments) { - if (pledge("stdio", nullptr) < 0) { - perror("pledge"); - return 1; - } + TRY(Core::System::pledge("stdio", nullptr)); StringView path; StringView suffix; @@ -22,7 +19,7 @@ int main(int argc, char** argv) Core::ArgsParser args_parser; args_parser.add_positional_argument(path, "Path to get basename from", "path"); args_parser.add_positional_argument(suffix, "Suffix to strip from name", "suffix", Core::ArgsParser::Required::No); - args_parser.parse(argc, argv); + args_parser.parse(arguments); auto result = LexicalPath::basename(path);