From 4a90729a3ed542688d4d2ee554814b280f6da4ee Mon Sep 17 00:00:00 2001 From: Federico Guerinoni Date: Fri, 26 Nov 2021 19:35:55 +0100 Subject: [PATCH] HackStudio: Port to LibMain :^) --- Userland/DevTools/HackStudio/CMakeLists.txt | 2 +- Userland/DevTools/HackStudio/main.cpp | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Userland/DevTools/HackStudio/CMakeLists.txt b/Userland/DevTools/HackStudio/CMakeLists.txt index 73089354177..8f6cc83d5ed 100644 --- a/Userland/DevTools/HackStudio/CMakeLists.txt +++ b/Userland/DevTools/HackStudio/CMakeLists.txt @@ -50,5 +50,5 @@ set(SOURCES ) serenity_app(HackStudio ICON app-hack-studio) -target_link_libraries(HackStudio LibWeb LibMarkdown LibGUI LibCpp LibGfx LibCore LibVT LibDebug LibX86 LibDiff LibShell LibSymbolication LibRegex LibSQL LibCoredump) +target_link_libraries(HackStudio LibWeb LibMarkdown LibGUI LibCpp LibGfx LibCore LibVT LibDebug LibX86 LibDiff LibShell LibSymbolication LibRegex LibSQL LibCoredump LibMain) add_dependencies(HackStudio CppLanguageServer) diff --git a/Userland/DevTools/HackStudio/main.cpp b/Userland/DevTools/HackStudio/main.cpp index c8b093106b0..0d65db23d3f 100644 --- a/Userland/DevTools/HackStudio/main.cpp +++ b/Userland/DevTools/HackStudio/main.cpp @@ -12,10 +12,12 @@ #include #include #include +#include #include #include #include #include +#include #include #include #include @@ -31,14 +33,11 @@ static bool make_is_available(); static void notify_make_not_available(); static void update_path_environment_variable(); -int main(int argc, char** argv) +ErrorOr serenity_main(Main::Arguments arguments) { - if (pledge("stdio recvfd sendfd tty rpath cpath wpath proc exec unix fattr thread ptrace", nullptr) < 0) { - perror("pledge"); - return 1; - } + TRY(Core::System::pledge("stdio recvfd sendfd tty rpath cpath wpath proc exec unix fattr thread ptrace", nullptr)); - auto app = GUI::Application::construct(argc, argv); + auto app = GUI::Application::construct(arguments.argc, arguments.argv); Config::pledge_domains({ "HackStudio", "Terminal" }); auto window = GUI::Window::construct(); @@ -56,7 +55,7 @@ int main(int argc, char** argv) Core::ArgsParser args_parser; args_parser.add_positional_argument(path_argument, "Path to a workspace or a file", "path", Core::ArgsParser::Required::No); args_parser.add_option(mode_coredump, "Inspect a coredump in HackStudio", "coredump", 'c'); - args_parser.parse(argc, argv); + args_parser.parse(arguments); auto argument_absolute_path = Core::File::real_path_for(path_argument);