RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 03:47:35 +00:00
Code Issues Activity Actions

cat: Use TRY() and LibCore syscall wrappers a lot more :^)

Browse source
This commit is contained in:
Andreas Kling 2021-11-26 15:54:05 +01:00
parent 58bcb93777
commit 5bf6503ed1
1 changed files with 22 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

49
Userland/Utilities/cat.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org> * Copyright (c) 2018-2021, Andreas Kling <kling@serenityos.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -8,13 +8,14 @@
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/System.h> #include <LibCore/System.h>
#include <LibMain/Main.h> #include <LibMain/Main.h>
#include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#define IFTRY(binding, expression) \
if (auto _temporary_result = (expression); !_temporary_result.is_error()) { \
auto binding = _temporary_result.release_value();
ErrorOr<int> serenity_main(Main::Arguments arguments) ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
TRY(Core::System::pledge("stdio rpath", nullptr)); TRY(Core::System::pledge("stdio rpath", nullptr));
@ -27,44 +28,38 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
args_parser.parse(arguments); args_parser.parse(arguments);
Vector<int> fds; Vector<int> fds;
if (!paths.is_empty()) { if (paths.is_empty()) {
TRY(fds.try_append(STDIN_FILENO));
} else {
for (auto const& path : paths) { for (auto const& path : paths) {
int fd; int fd;
if (path == "-") { if (path == "-") {
fd = 0; fd = 0;
} else if ((fd = open(path.characters(), O_RDONLY)) == -1) { } else {
warnln("Failed to open {}: {}", path, strerror(errno)); auto fd_or_error = Core::System::open(path, O_RDONLY);
continue; if (fd_or_error.is_error()) {
warnln("Failed to open {}: {}", path, fd_or_error.error());
continue;
}
fd = fd_or_error.release_value();
} }
fds.append(fd); TRY(fds.try_append(fd));
} }
} else {
fds.append(0);
} }
TRY(Core::System::pledge("stdio", nullptr)); TRY(Core::System::pledge("stdio", nullptr));
for (auto& fd : fds) { for (auto& fd : fds) {
for (;;) { for (;;) {
char buf[32768]; char buffer[32768];
ssize_t nread = read(fd, buf, sizeof(buf)); auto nread = TRY(Core::System::read(fd, buffer, sizeof(buffer)));
if (nread == 0) if (nread == 0)
break; break;
if (nread < 0) { ssize_t already_written = 0;
perror("read"); while (already_written < nread)
return 2; already_written += TRY(Core::System::write(STDOUT_FILENO, buffer + already_written, nread - already_written));
}
size_t already_written = 0;
while (already_written < (size_t)nread) {
ssize_t nwritten = write(1, buf + already_written, nread - already_written);
if (nwritten < 0) {
perror("write");
return 3;
}
already_written += nwritten;
}
} }
close(fd); TRY(Core::System::close(fd));
} }
return 0; return 0;