From d3cf68a5407a756e79a5b2f97303b855b7253e86 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Mon, 22 Nov 2021 15:44:54 +0100 Subject: [PATCH] LibMain: Add a new library for more ergonomic userspace entry functions By linking with LibMain, your program no longer needs to provide main(). Instead, execution begins in this function: ErrorOr serenity_main(Main::Arguments); This allows programs that link with LibMain to use TRY() already in their entry function, without having to do manual ErrorOr unwrapping. This is very experimental, but it seems like a nice idea so let's try it out. :^) --- Userland/Libraries/CMakeLists.txt | 1 + Userland/Libraries/LibMain/CMakeLists.txt | 6 +++++ Userland/Libraries/LibMain/Main.cpp | 29 +++++++++++++++++++++++ Userland/Libraries/LibMain/Main.h | 21 ++++++++++++++++ 4 files changed, 57 insertions(+) create mode 100644 Userland/Libraries/LibMain/CMakeLists.txt create mode 100644 Userland/Libraries/LibMain/Main.cpp create mode 100644 Userland/Libraries/LibMain/Main.h diff --git a/Userland/Libraries/CMakeLists.txt b/Userland/Libraries/CMakeLists.txt index f51f4d1390..ff35c42f14 100644 --- a/Userland/Libraries/CMakeLists.txt +++ b/Userland/Libraries/CMakeLists.txt @@ -30,6 +30,7 @@ add_subdirectory(LibJS) add_subdirectory(LibKeyboard) add_subdirectory(LibLine) add_subdirectory(LibM) +add_subdirectory(LibMain) add_subdirectory(LibMarkdown) add_subdirectory(LibPCIDB) add_subdirectory(LibPDF) diff --git a/Userland/Libraries/LibMain/CMakeLists.txt b/Userland/Libraries/LibMain/CMakeLists.txt new file mode 100644 index 0000000000..6dc9cd651d --- /dev/null +++ b/Userland/Libraries/LibMain/CMakeLists.txt @@ -0,0 +1,6 @@ +set(SOURCES + Main.cpp +) + +serenity_lib(LibMain main) +target_link_libraries(LibMain LibC) diff --git a/Userland/Libraries/LibMain/Main.cpp b/Userland/Libraries/LibMain/Main.cpp new file mode 100644 index 0000000000..1cee6c2e49 --- /dev/null +++ b/Userland/Libraries/LibMain/Main.cpp @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2021, Andreas Kling + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include +#include +#include + +int main(int argc, char** argv) +{ + Vector arguments; + arguments.ensure_capacity(argc); + for (int i = 0; i < argc; ++i) + arguments.unchecked_append(argv[i]); + + auto result = serenity_main({ + .argc = argc, + .argv = argv, + .arguments = arguments.span(), + }); + if (result.is_error()) { + warnln("Runtime error: {}", result.error()); + return 1; + } + return result.value(); +} diff --git a/Userland/Libraries/LibMain/Main.h b/Userland/Libraries/LibMain/Main.h new file mode 100644 index 0000000000..ee8e85b3cb --- /dev/null +++ b/Userland/Libraries/LibMain/Main.h @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2021, Andreas Kling + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#pragma once + +#include + +namespace Main { + +struct Arguments { + int argc {}; + char** argv {}; + Span arguments; +}; + +} + +ErrorOr serenity_main(Main::Arguments);