From 0de575ec11cd059663b10e11eca0b4282e0ca0de Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Thu, 2 Dec 2021 22:42:10 +0100 Subject: [PATCH] ls: Port to LibMain :^) --- Userland/Utilities/CMakeLists.txt | 1 + Userland/Utilities/ls.cpp | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Userland/Utilities/CMakeLists.txt b/Userland/Utilities/CMakeLists.txt index 2027c6a5ec..68ef420ce6 100644 --- a/Userland/Utilities/CMakeLists.txt +++ b/Userland/Utilities/CMakeLists.txt @@ -85,6 +85,7 @@ target_link_libraries(id LibMain) target_link_libraries(js LibJS LibLine LibMain) target_link_libraries(keymap LibKeyboard LibMain) target_link_libraries(logout LibMain) +target_link_libraries(ls LibMain) target_link_libraries(lspci LibPCIDB LibMain) target_link_libraries(lsusb LibUSBDB LibMain) target_link_libraries(man LibMarkdown LibMain) diff --git a/Userland/Utilities/ls.cpp b/Userland/Utilities/ls.cpp index 39614ed889..51f90d905d 100644 --- a/Userland/Utilities/ls.cpp +++ b/Userland/Utilities/ls.cpp @@ -17,6 +17,8 @@ #include #include #include +#include +#include #include #include #include @@ -71,12 +73,9 @@ static HashMap groups; static bool is_a_tty = false; -int main(int argc, char** argv) +ErrorOr serenity_main(Main::Arguments arguments) { - if (pledge("stdio rpath tty", nullptr) < 0) { - perror("pledge"); - return 1; - } + TRY(Core::System::pledge("stdio rpath tty")); struct winsize ws; int rc = ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws); @@ -118,7 +117,7 @@ int main(int argc, char** argv) args_parser.add_option(flag_disable_hyperlinks, "Disable hyperlinks", "no-hyperlinks", 'K'); args_parser.add_option(flag_recursive, "List subdirectories recursively", "recursive", 'R'); args_parser.add_positional_argument(paths, "Directory to list", "path", Core::ArgsParser::Required::No); - args_parser.parse(argc, argv); + args_parser.parse(arguments); if (flag_show_almost_all_dotfiles) flag_show_dotfiles = true;