From dff64603730a65c31e2e104a9852a8ed9401d3a1 Mon Sep 17 00:00:00 2001 From: Fabian INGREMEAU Date: Sun, 23 Jan 2022 18:09:30 +0100 Subject: [PATCH] mv: Port to LibMain --- Userland/Utilities/CMakeLists.txt | 1 + Userland/Utilities/mv.cpp | 13 ++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Userland/Utilities/CMakeLists.txt b/Userland/Utilities/CMakeLists.txt index f46251b48d..de947882b2 100644 --- a/Userland/Utilities/CMakeLists.txt +++ b/Userland/Utilities/CMakeLists.txt @@ -132,6 +132,7 @@ target_link_libraries(mkdir LibMain) target_link_libraries(mkfifo LibMain) target_link_libraries(mknod LibMain) target_link_libraries(mktemp LibMain) +target_link_libraries(mv LibMain) target_link_libraries(nc LibMain) target_link_libraries(netstat LibMain) target_link_libraries(notify LibGUI) diff --git a/Userland/Utilities/mv.cpp b/Userland/Utilities/mv.cpp index 56cc52343e..ba103665c8 100644 --- a/Userland/Utilities/mv.cpp +++ b/Userland/Utilities/mv.cpp @@ -8,17 +8,16 @@ #include #include #include +#include +#include #include #include #include #include -int main(int argc, char** argv) +ErrorOr serenity_main(Main::Arguments arguments) { - if (pledge("stdio rpath wpath cpath fattr", nullptr) < 0) { - perror("pledge"); - return 1; - } + TRY(Core::System::pledge("stdio rpath wpath cpath fattr")); // NOTE: The "force" option is a dummy for now, it's just here to silence scripts that use "mv -f" // In the future, it might be used to cancel out an "-i" interactive option. @@ -31,10 +30,10 @@ int main(int argc, char** argv) args_parser.add_option(force, "Force", "force", 'f'); args_parser.add_option(verbose, "Verbose", "verbose", 'v'); args_parser.add_positional_argument(paths, "Paths to files being moved followed by target location", "paths"); - args_parser.parse(argc, argv); + args_parser.parse(arguments); if (paths.size() < 2) { - args_parser.print_usage(stderr, argv[0]); + args_parser.print_usage(stderr, arguments.argv[0]); return 1; }