RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 12:07:45 +00:00
Code Issues Activity Actions

Browser: Port to LibMain :^)

Browse source
This commit is contained in:
Andreas Kling 2021-11-22 19:47:14 +01:00
parent f5927f167b
commit 05e45bfdc5
2 changed files with 14 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Applications/Browser/CMakeLists.txt
View file

@ -26,4 +26,4 @@ set(SOURCES
) )
serenity_app(Browser ICON app-browser) serenity_app(Browser ICON app-browser)
target_link_libraries(Browser LibWeb LibProtocol LibGUI LibDesktop LibConfig) target_link_libraries(Browser LibWeb LibProtocol LibGUI LibDesktop LibConfig LibMain)

51
Userland/Applications/Browser/main.cpp
View file

@ -19,6 +19,8 @@
#include <LibGUI/BoxLayout.h> #include <LibGUI/BoxLayout.h>
#include <LibGUI/Icon.h> #include <LibGUI/Icon.h>
#include <LibGUI/TabWidget.h> #include <LibGUI/TabWidget.h>
#include <LibMain/Main.h>
#include <LibSystem/Wrappers.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
@ -30,25 +32,22 @@ Vector<String> g_content_filters;
} }
int main(int argc, char** argv) ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
if (getuid() == 0) { if (getuid() == 0) {
warnln("Refusing to run as root"); warnln("Refusing to run as root");
return 1; return 1;
} }
if (pledge("stdio recvfd sendfd unix cpath rpath wpath", nullptr) < 0) { TRY(System::pledge("stdio recvfd sendfd unix cpath rpath wpath", nullptr));
perror("pledge");
return 1;
}
const char* specified_url = nullptr; const char* specified_url = nullptr;
Core::ArgsParser args_parser; Core::ArgsParser args_parser;
args_parser.add_positional_argument(specified_url, "URL to open", "url", Core::ArgsParser::Required::No); args_parser.add_positional_argument(specified_url, "URL to open", "url", Core::ArgsParser::Required::No);
args_parser.parse(argc, argv); args_parser.parse(arguments.argc, arguments.argv);
auto app = GUI::Application::construct(argc, argv); auto app = GUI::Application::construct(arguments.argc, arguments.argv);
Config::pledge_domains("Browser"); Config::pledge_domains("Browser");
@ -61,37 +60,13 @@ int main(int argc, char** argv)
return 1; return 1;
} }
if (unveil("/home", "rwc") < 0) { TRY(System::unveil("/home", "rwc"));
perror("unveil"); TRY(System::unveil("/res", "r"));
return 1; TRY(System::unveil("/etc/passwd", "r"));
} TRY(System::unveil("/tmp/portal/image", "rw"));
TRY(System::unveil("/tmp/portal/webcontent", "rw"));
if (unveil("/res", "r") < 0) { TRY(System::unveil("/tmp/portal/request", "rw"));
perror("unveil"); TRY(System::unveil(nullptr, nullptr));
return 1;
}
if (unveil("/etc/passwd", "r") < 0) {
perror("unveil");
return 1;
}
if (unveil("/tmp/portal/image", "rw") < 0) {
perror("unveil");
return 1;
}
if (unveil("/tmp/portal/webcontent", "rw") < 0) {
perror("unveil");
return 1;
}
if (unveil("/tmp/portal/request", "rw") < 0) {
perror("unveil");
return 1;
}
unveil(nullptr, nullptr);
auto app_icon = GUI::Icon::default_icon("app-browser"); auto app_icon = GUI::Icon::default_icon("app-browser");