|
@@ -7,33 +7,23 @@
|
|
#include <LibCore/EventLoop.h>
|
|
#include <LibCore/EventLoop.h>
|
|
#include <LibCore/LocalServer.h>
|
|
#include <LibCore/LocalServer.h>
|
|
#include <LibIPC/ClientConnection.h>
|
|
#include <LibIPC/ClientConnection.h>
|
|
|
|
+#include <LibMain/Main.h>
|
|
|
|
+#include <LibSystem/Wrappers.h>
|
|
#include <LibTLS/Certificate.h>
|
|
#include <LibTLS/Certificate.h>
|
|
#include <WebSocket/ClientConnection.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.
|
|
// Ensure the certificates are read out here.
|
|
[[maybe_unused]] auto& certs = DefaultRootCACertificates::the();
|
|
[[maybe_unused]] auto& certs = DefaultRootCACertificates::the();
|
|
|
|
|
|
Core::EventLoop event_loop;
|
|
Core::EventLoop event_loop;
|
|
// FIXME: Establish a connection to LookupServer and then drop "unix"?
|
|
// 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();
|
|
auto socket = Core::LocalSocket::take_over_accepted_socket_from_system_server();
|
|
VERIFY(socket);
|
|
VERIFY(socket);
|