From cd7b50a07471a06bd6d03293ba9eb2e9c0c75b1f Mon Sep 17 00:00:00 2001 From: mjz19910 Date: Sun, 2 Jan 2022 01:49:26 -0700 Subject: [PATCH] uptime: Port to LibMain :^) --- Userland/Utilities/CMakeLists.txt | 1 + Userland/Utilities/uptime.cpp | 14 +++++--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Userland/Utilities/CMakeLists.txt b/Userland/Utilities/CMakeLists.txt index 0df6a63878c..fbcd31a5b76 100644 --- a/Userland/Utilities/CMakeLists.txt +++ b/Userland/Utilities/CMakeLists.txt @@ -150,6 +150,7 @@ target_link_libraries(touch LibMain) target_link_libraries(truncate LibMain) target_link_libraries(tt LibPthread) target_link_libraries(unzip LibArchive LibCompress) +target_link_libraries(uptime LibMain) target_link_libraries(userdel LibMain) target_link_libraries(usermod LibMain) target_link_libraries(utmpupdate LibMain) diff --git a/Userland/Utilities/uptime.cpp b/Userland/Utilities/uptime.cpp index 530e85b88a2..ce698461ac8 100644 --- a/Userland/Utilities/uptime.cpp +++ b/Userland/Utilities/uptime.cpp @@ -5,15 +5,14 @@ */ #include +#include +#include #include #include -int main(int, char**) +ErrorOr serenity_main(Main::Arguments) { - if (pledge("stdio rpath", nullptr) < 0) { - perror("pledge"); - return 1; - } + TRY(Core::System::pledge("stdio rpath")); FILE* fp = fopen("/proc/uptime", "r"); if (!fp) { @@ -21,10 +20,7 @@ int main(int, char**) return 1; } - if (pledge("stdio", nullptr) < 0) { - perror("pledge"); - return 1; - } + TRY(Core::System::pledge("stdio")); char buffer[BUFSIZ]; auto* p = fgets(buffer, sizeof(buffer), fp);