From 98e65f71da8f525c0b3b29d0c2264090007e0d5c Mon Sep 17 00:00:00 2001
From: Kenneth Myhra <kennethmyhra@gmail.com>
Date: Thu, 25 Nov 2021 21:09:48 +0100
Subject: [PATCH] echo: Port to LibMain :^)

---
 Userland/Utilities/CMakeLists.txt |  1 +
 Userland/Utilities/echo.cpp       | 11 +++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Userland/Utilities/CMakeLists.txt b/Userland/Utilities/CMakeLists.txt
index 4f61fc0a4a..f293faab72 100644
--- a/Userland/Utilities/CMakeLists.txt
+++ b/Userland/Utilities/CMakeLists.txt
@@ -67,6 +67,7 @@ target_link_libraries(copy LibGUI LibMain)
 target_link_libraries(diff LibDiff)
 target_link_libraries(disasm LibX86)
 target_link_libraries(dmesg LibMain)
+target_link_libraries(echo LibMain)
 target_link_libraries(expr LibRegex)
 target_link_libraries(fdtdump LibDeviceTree)
 target_link_libraries(file LibGfx LibIPC LibCompress)
diff --git a/Userland/Utilities/echo.cpp b/Userland/Utilities/echo.cpp
index 8e02b34929..40b5519641 100644
--- a/Userland/Utilities/echo.cpp
+++ b/Userland/Utilities/echo.cpp
@@ -7,6 +7,8 @@
 #include <AK/CharacterTypes.h>
 #include <AK/GenericLexer.h>
 #include <LibCore/ArgsParser.h>
+#include <LibCore/System.h>
+#include <LibMain/Main.h>
 #include <stdio.h>
 #include <unistd.h>
 
@@ -95,12 +97,9 @@ static String interpret_backslash_escapes(StringView string, bool& no_trailing_n
     return builder.build();
 }
 
-int main(int argc, char** argv)
+ErrorOr<int> serenity_main(Main::Arguments arguments)
 {
-    if (pledge("stdio", nullptr) < 0) {
-        perror("pledge");
-        return 1;
-    }
+    TRY(Core::System::pledge("stdio", nullptr));
 
     Vector<const char*> text;
     bool no_trailing_newline = false;
@@ -111,7 +110,7 @@ int main(int argc, char** argv)
     args_parser.add_option(should_interpret_backslash_escapes, "Interpret backslash escapes", nullptr, 'e');
     args_parser.add_positional_argument(text, "Text to print out", "text", Core::ArgsParser::Required::No);
     args_parser.set_stop_on_first_non_option(true);
-    args_parser.parse(argc, argv);
+    args_parser.parse(arguments);
 
     if (text.is_empty()) {
         if (!no_trailing_newline)