From f25466ae08b3d5cab205cc41ffe963007b244dd0 Mon Sep 17 00:00:00 2001 From: Kenneth Myhra Date: Sat, 27 Nov 2021 10:14:54 +0100 Subject: [PATCH] bt: Port to LibMain :^) --- Userland/Utilities/CMakeLists.txt | 2 +- Userland/Utilities/bt.cpp | 19 +++++++------------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/Userland/Utilities/CMakeLists.txt b/Userland/Utilities/CMakeLists.txt index 18709a2c96..7ac3e60ef9 100644 --- a/Userland/Utilities/CMakeLists.txt +++ b/Userland/Utilities/CMakeLists.txt @@ -57,7 +57,7 @@ target_link_libraries(arp LibMain) target_link_libraries(asctl LibAudio LibMain) target_link_libraries(base64 LibMain) target_link_libraries(basename LibMain) -target_link_libraries(bt LibSymbolication) +target_link_libraries(bt LibSymbolication LibMain) target_link_libraries(blockdev LibMain) target_link_libraries(cat LibMain) target_link_libraries(checksum LibCrypto) diff --git a/Userland/Utilities/bt.cpp b/Userland/Utilities/bt.cpp index b598343c95..f0cd6b7875 100644 --- a/Userland/Utilities/bt.cpp +++ b/Userland/Utilities/bt.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2021, Andreas Kling + * Copyright (c) 2021, Kenneth Myhra * * SPDX-License-Identifier: BSD-2-Clause */ @@ -9,26 +10,20 @@ #include #include #include -#include +#include +#include #include #include -int main(int argc, char** argv) +ErrorOr serenity_main(Main::Arguments arguments) { - if (pledge("stdio rpath", nullptr) < 0) { - perror("pledge"); - return 1; - } - char hostname[256]; - if (gethostname(hostname, sizeof(hostname)) < 0) { - perror("gethostname"); - return 1; - } + TRY(Core::System::pledge("stdio rpath", nullptr)); + auto hostname = TRY(Core::System::gethostname()); Core::ArgsParser args_parser; pid_t pid = 0; args_parser.add_positional_argument(pid, "PID", "pid"); - args_parser.parse(argc, argv); + args_parser.parse(arguments); Core::EventLoop loop; Core::DirIterator iterator(String::formatted("/proc/{}/stacks", pid), Core::DirIterator::SkipDots);