WebSocket: Port to LibMain :^)

cubiclove · Nov 23, 2021 · c6a581f · c6a581f
1 parent c2b90ba
commit c6a581f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 18 deletions.
diff --git 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
@@ -7,33 +7,23 @@
 #include <LibCore/EventLoop.h>
 #include <LibCore/LocalServer.h>
 #include <LibIPC/ClientConnection.h>
+#include <LibMain/Main.h>
+#include <LibSystem/Wrappers.h>
 #include <LibTLS/Certificate.h>
 #include <WebSocket/ClientConnection.h>
 
-int main(int, char**)
+ErrorOr<int> 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);