From 03b6ff2bf0ba03599a853ff4e6cb61ba8443b2b2 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Tue, 23 Nov 2021 15:13:16 +0100 Subject: [PATCH] utmpupdate: Port to LibMain :^) --- Userland/Utilities/CMakeLists.txt | 1 + Userland/Utilities/utmpupdate.cpp | 45 +++++++++++-------------------- 2 files changed, 17 insertions(+), 29 deletions(-) diff --git a/Userland/Utilities/CMakeLists.txt b/Userland/Utilities/CMakeLists.txt index a17cbbdf92..0818e2d37b 100644 --- a/Userland/Utilities/CMakeLists.txt +++ b/Userland/Utilities/CMakeLists.txt @@ -100,6 +100,7 @@ target_link_libraries(test-pthread LibThreading) target_link_libraries(truncate LibMain) target_link_libraries(tt LibPthread) target_link_libraries(unzip LibArchive LibCompress) +target_link_libraries(utmpupdate LibMain) target_link_libraries(zip LibArchive LibCompress LibCrypto) target_link_libraries(cpp-lexer LibCpp) target_link_libraries(cpp-parser LibCpp LibGUI) diff --git a/Userland/Utilities/utmpupdate.cpp b/Userland/Utilities/utmpupdate.cpp index 782a605708..a0650ef016 100644 --- a/Userland/Utilities/utmpupdate.cpp +++ b/Userland/Utilities/utmpupdate.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, Andreas Kling + * Copyright (c) 2020-2021, Andreas Kling * * SPDX-License-Identifier: BSD-2-Clause */ @@ -11,21 +11,15 @@ #include #include #include +#include +#include #include -int main(int argc, char** argv) +ErrorOr serenity_main(Main::Arguments arguments) { - if (pledge("stdio wpath cpath", nullptr) < 0) { - perror("pledge"); - return 1; - } - - if (unveil("/var/run/utmp", "rwc") < 0) { - perror("unveil"); - return 1; - } - - unveil(nullptr, nullptr); + TRY(Core::System::pledge("stdio wpath cpath", nullptr)); + TRY(Core::System::unveil("/var/run/utmp", "rwc")); + TRY(Core::System::unveil(nullptr, nullptr)); pid_t pid = 0; bool flag_create = false; @@ -39,8 +33,7 @@ int main(int argc, char** argv) args_parser.add_option(pid, "PID", "PID", 'p', "PID"); args_parser.add_option(from, "From", "from", 'f', "From"); args_parser.add_positional_argument(tty_name, "TTY name", "tty"); - - args_parser.parse(argc, argv); + args_parser.parse(arguments); if (flag_create && flag_delete) { warnln("-c and -d are mutually exclusive"); @@ -49,24 +42,18 @@ int main(int argc, char** argv) dbgln("Updating utmp from UID={} GID={} EGID={} PID={}", getuid(), getgid(), getegid(), pid); - auto file_or_error = Core::File::open("/var/run/utmp", Core::OpenMode::ReadWrite); - if (file_or_error.is_error()) { - dbgln("Error: {}", file_or_error.error()); - return 1; - } + auto file = TRY(Core::File::open("/var/run/utmp", Core::OpenMode::ReadWrite)); - auto& file = *file_or_error.value(); - - auto file_contents = file.read_all(); - auto previous_json = JsonValue::from_string(file_contents); + auto file_contents = file->read_all(); + auto previous_json = TRY(JsonValue::from_string(file_contents)); JsonObject json; if (!file_contents.is_empty()) { - if (previous_json.is_error() || !previous_json.value().is_object()) { + if (!previous_json.is_object()) { dbgln("Error: Could not parse JSON"); } else { - json = previous_json.value().as_object(); + json = previous_json.as_object(); } } @@ -83,17 +70,17 @@ int main(int argc, char** argv) json.remove(tty_name); } - if (!file.seek(0)) { + if (!file->seek(0)) { dbgln("Seek failed"); return 1; } - if (!file.truncate(0)) { + if (!file->truncate(0)) { dbgln("Truncation failed"); return 1; } - if (!file.write(json.to_string())) { + if (!file->write(json.to_string())) { dbgln("Write failed"); return 1; }