From c6a581f267d7faadc584b7b2ee0f89494ab6603c Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Tue, 23 Nov 2021 10:38:52 +0100 Subject: [PATCH] WebSocket: Port to LibMain :^) --- Userland/Services/WebSocket/CMakeLists.txt | 2 +- Userland/Services/WebSocket/main.cpp | 24 +++++++--------------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/Userland/Services/WebSocket/CMakeLists.txt b/Userland/Services/WebSocket/CMakeLists.txt index 47b73ae266..798b01e8f8 100644 --- a/Userland/Services/WebSocket/CMakeLists.txt +++ b/Userland/Services/WebSocket/CMakeLists.txt @@ -14,4 +14,4 @@ set(SOURCES ) serenity_bin(WebSocket) -target_link_libraries(WebSocket LibCore LibIPC LibWebSocket) +target_link_libraries(WebSocket LibCore LibIPC LibWebSocket LibMain) diff --git a/Userland/Services/WebSocket/main.cpp b/Userland/Services/WebSocket/main.cpp index ab6ca577b2..0e8cf8b0ab 100644 --- a/Userland/Services/WebSocket/main.cpp +++ b/Userland/Services/WebSocket/main.cpp @@ -7,33 +7,23 @@ #include #include #include +#include +#include #include #include -int main(int, char**) +ErrorOr serenity_main(Main::Arguments) { - if (pledge("stdio inet unix rpath sendfd recvfd", nullptr) < 0) { - perror("pledge"); - return 1; - } + TRY(System::pledge("stdio inet unix rpath sendfd recvfd", nullptr)); // Ensure the certificates are read out here. [[maybe_unused]] auto& certs = DefaultRootCACertificates::the(); Core::EventLoop event_loop; // FIXME: Establish a connection to LookupServer and then drop "unix"? - if (pledge("stdio inet unix sendfd recvfd", nullptr) < 0) { - perror("pledge"); - return 1; - } - if (unveil("/tmp/portal/lookup", "rw") < 0) { - perror("unveil"); - return 1; - } - if (unveil(nullptr, nullptr) < 0) { - perror("unveil"); - return 1; - } + TRY(System::pledge("stdio inet unix sendfd recvfd", nullptr)); + TRY(System::unveil("/tmp/portal/lookup", "rw")); + TRY(System::unveil(nullptr, nullptr)); auto socket = Core::LocalSocket::take_over_accepted_socket_from_system_server(); VERIFY(socket);