From b65a039db76f5010adb67f436f74c5e80bc7635e Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Mon, 22 Nov 2021 23:35:23 +0100 Subject: [PATCH] Applets/ResourceGraph: Port to LibMain :^) This simplifies a bunch of calls to pledge() and unveil(). --- Userland/Applets/ResourceGraph/CMakeLists.txt | 2 +- Userland/Applets/ResourceGraph/main.cpp | 44 +++++-------------- 2 files changed, 13 insertions(+), 33 deletions(-) diff --git a/Userland/Applets/ResourceGraph/CMakeLists.txt b/Userland/Applets/ResourceGraph/CMakeLists.txt index 6b77f6c439..902deb8bd2 100644 --- a/Userland/Applets/ResourceGraph/CMakeLists.txt +++ b/Userland/Applets/ResourceGraph/CMakeLists.txt @@ -9,4 +9,4 @@ set(SOURCES ) serenity_bin(ResourceGraph.Applet) -target_link_libraries(ResourceGraph.Applet LibGUI LibCore LibGfx) +target_link_libraries(ResourceGraph.Applet LibGUI LibCore LibGfx LibMain) diff --git a/Userland/Applets/ResourceGraph/main.cpp b/Userland/Applets/ResourceGraph/main.cpp index bf23800d77..ade6d8dc69 100644 --- a/Userland/Applets/ResourceGraph/main.cpp +++ b/Userland/Applets/ResourceGraph/main.cpp @@ -14,6 +14,8 @@ #include #include #include +#include +#include #include #include #include @@ -181,26 +183,20 @@ private: RefPtr m_proc_mem; }; -int main(int argc, char** argv) +ErrorOr serenity_main(Main::Arguments arguments) { - if (pledge("stdio recvfd sendfd proc exec rpath unix", nullptr) < 0) { - perror("pledge"); - return 1; - } + TRY(System::pledge("stdio recvfd sendfd proc exec rpath unix", nullptr)); - auto app = GUI::Application::construct(argc, argv); + auto app = GUI::Application::construct(arguments.argc, arguments.argv); - if (pledge("stdio recvfd sendfd proc exec rpath", nullptr) < 0) { - perror("pledge"); - return 1; - } + TRY(System::pledge("stdio recvfd sendfd proc exec rpath", nullptr)); const char* cpu = nullptr; const char* memory = nullptr; Core::ArgsParser args_parser; args_parser.add_option(cpu, "Create CPU graph", "cpu", 'C', "cpu"); args_parser.add_option(memory, "Create memory graph", "memory", 'M', "memory"); - args_parser.parse(argc, argv); + args_parser.parse(arguments.argc, arguments.argv); if (!cpu && !memory) { printf("At least one of --cpu or --memory must be used"); @@ -235,27 +231,11 @@ int main(int argc, char** argv) if (memory) create_applet(GraphType::Memory, memory); - if (unveil("/res", "r") < 0) { - perror("unveil"); - return 1; - } - - if (unveil("/proc/stat", "r") < 0) { - perror("unveil"); - return 1; - } - - if (unveil("/proc/memstat", "r") < 0) { - perror("unveil"); - return 1; - } - - if (unveil("/bin/SystemMonitor", "x") < 0) { - perror("unveil"); - return 1; - } - - unveil(nullptr, nullptr); + TRY(System::unveil("/res", "r")); + TRY(System::unveil("/proc/stat", "r")); + TRY(System::unveil("/proc/memstat", "r")); + TRY(System::unveil("/bin/SystemMonitor", "x")); + TRY(System::unveil(nullptr, nullptr)); return app->exec(); }