RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 07:48:11 +00:00
Code Issues Activity Actions

sleep: Port to LibMain

Browse source
This commit is contained in:
alexmajor 2022-01-24 20:27:22 -05:00 • committed by Brian Gianforcaro
parent 55496ab7fb
commit a79e730839
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Userland/Utilities/CMakeLists.txt
View file

@ -161,8 +161,9 @@ target_link_libraries(run-tests LibRegex LibCoredump)
target_link_libraries(shot LibGUI LibMain) target_link_libraries(shot LibGUI LibMain)
target_link_libraries(shuf LibMain) target_link_libraries(shuf LibMain)
target_link_libraries(shutdown LibMain) target_link_libraries(shutdown LibMain)
target_link_libraries(sql LibLine LibMain LibSQL LibIPC) target_link_libraries(sleep LibMain)
target_link_libraries(sort LibMain) target_link_libraries(sort LibMain)
target_link_libraries(sql LibLine LibMain LibSQL LibIPC)
target_link_libraries(stat LibMain) target_link_libraries(stat LibMain)
target_link_libraries(strace LibMain) target_link_libraries(strace LibMain)
target_link_libraries(stty LibMain) target_link_libraries(stty LibMain)

14
Userland/Utilities/sleep.cpp
View file

@ -1,10 +1,13 @@
/* /*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org> * Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2022, Alex Major
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <errno.h> #include <errno.h>
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
@ -18,23 +21,20 @@ static void handle_sigint(int)
g_interrupted = true; g_interrupted = true;
} }
int main(int argc, char** argv) ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
double secs; double secs;
Core::ArgsParser args_parser; Core::ArgsParser args_parser;
args_parser.add_positional_argument(secs, "Number of seconds to sleep for", "num-seconds"); args_parser.add_positional_argument(secs, "Number of seconds to sleep for", "num-seconds");
args_parser.parse(argc, argv); args_parser.parse(arguments);
struct sigaction sa; struct sigaction sa;
memset(&sa, 0, sizeof(struct sigaction)); memset(&sa, 0, sizeof(struct sigaction));
sa.sa_handler = handle_sigint; sa.sa_handler = handle_sigint;
sigaction(SIGINT, &sa, nullptr); sigaction(SIGINT, &sa, nullptr);
if (pledge("stdio sigaction", nullptr) < 0) { TRY(Core::System::pledge("stdio sigaction", nullptr));
perror("pledge");
return 1;
}
double whole_seconds = static_cast<time_t>(secs); double whole_seconds = static_cast<time_t>(secs);
double fraction = secs - whole_seconds; double fraction = secs - whole_seconds;
@ -63,7 +63,7 @@ sleep_again:
outln("Sleep interrupted with {}.{} seconds remaining.", remaining_sleep.tv_sec, remaining_sleep.tv_nsec); outln("Sleep interrupted with {}.{} seconds remaining.", remaining_sleep.tv_sec, remaining_sleep.tv_nsec);
} }
signal(SIGINT, SIG_DFL); TRY(Core::System::signal(SIGINT, SIG_DFL));
if (g_interrupted) if (g_interrupted)
raise(SIGINT); raise(SIGINT);