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

less: Replace LibC calls with their LibCore equivalents

Browse source
This commit is contained in:
Tim Ledbetter 2023-07-12 19:49:32 +01:00 • committed by Andreas Kling
parent e0fcfc8a99
commit 6d2f9f0316
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Userland/Utilities/less.cpp
View file

@ -9,9 +9,7 @@
#include <LibCore/System.h> #include <LibCore/System.h>
#include <LibLine/Editor.h> #include <LibLine/Editor.h>
#include <LibMain/Main.h> #include <LibMain/Main.h>
#include <csignal>
#include <stdio.h> #include <stdio.h>
#include <sys/ioctl.h>
#include <termios.h> #include <termios.h>
#include <unistd.h> #include <unistd.h>
@ -181,8 +179,8 @@ public:
{ {
// First, we get the current size of the window. // First, we get the current size of the window.
struct winsize window; struct winsize window;
if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &window) == -1) { if (auto maybe_error = Core::System::ioctl(STDOUT_FILENO, TIOCGWINSZ, &window); maybe_error.is_error()) {
perror("ioctl(2)"); warnln("ioctl(2): {}", strerror(maybe_error.error().code()));
return; return;
} }
@ -522,9 +520,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
// On SIGWINCH set this flag so that the main-loop knows when the terminal // On SIGWINCH set this flag so that the main-loop knows when the terminal
// has been resized. // has been resized.
signal(SIGWINCH, [](auto) { struct sigaction resize_action;
resize_action.sa_handler = [](auto) {
g_resized = true; g_resized = true;
}); };
TRY(Core::System::sigaction(SIGWINCH, &resize_action, nullptr));
TRY(Core::System::pledge("stdio tty sigaction")); TRY(Core::System::pledge("stdio tty sigaction"));
@ -535,7 +535,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
prompt = "--More--"; prompt = "--More--";
} }
if (!isatty(STDOUT_FILENO)) { if (!TRY(Core::System::isatty(STDOUT_FILENO))) {
cat_file(file); cat_file(file);
return 0; return 0;
} }