LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-01-01 15:43:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

rev: Unbreak reading from standard input

Browse Source 
Since Core::File does not handle streaming input properly (see #5093
and #4198), we use the LibC APIs instead.
This commit is contained in:
SeekingBlues 2021-10-13 20:05:28 -04:00 committed by Brian Gianforcaro
parent 6d4e58efea
commit 9705580c53
Notes: sideshowbarker 2024-07-18 02:13:54 +09:00 
Author: https://github.com/SeekingBlues
Commit: https://github.com/SerenityOS/serenity/commit/9705580c53b
Pull-request: https://github.com/SerenityOS/serenity/pull/10465
Reviewed-by: https://github.com/BenWiederhake
1 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Userland/Utilities/rev.cpp
View File

@ -4,10 +4,9 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <AK/String.h>
#include <AK/Vector.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/File.h> #include <errno.h>
#include <string.h>
#include <unistd.h> #include <unistd.h>
int main(int argc, char** argv) int main(int argc, char** argv)
@ -24,30 +23,50 @@ int main(int argc, char** argv)
args_parser.add_positional_argument(paths, "File path", "path", Core::ArgsParser::Required::No); args_parser.add_positional_argument(paths, "File path", "path", Core::ArgsParser::Required::No);
args_parser.parse(argc, argv); args_parser.parse(argc, argv);
Vector<RefPtr<Core::File>> files; Vector<FILE*> streams;
if (paths.is_empty()) { auto num_paths = paths.size();
files.append(Core::File::standard_input()); streams.ensure_capacity(num_paths ? num_paths : 1);
} else {
if (!paths.is_empty()) {
for (auto const& path : paths) { for (auto const& path : paths) {
auto file_or_error = Core::File::open(path, Core::OpenMode::ReadOnly); FILE* stream = fopen(path.characters(), "r");
if (file_or_error.is_error()) { if (!stream) {
warnln("Failed to open {}: {}", path, file_or_error.error()); warnln("Failed to open {}: {}", path, strerror(errno));
continue; continue;
} }
streams.append(stream);
files.append(file_or_error.value());
} }
} else {
streams.append(stdin);
} }
char* buffer = nullptr;
ScopeGuard guard = [&] {
free(buffer);
for (auto* stream : streams) {
if (fclose(stream))
perror("fclose");
}
};
if (pledge("stdio", nullptr) < 0) { if (pledge("stdio", nullptr) < 0) {
perror("pledge"); perror("pledge");
return 1; return 1;
} }
for (auto& file : files) { for (auto* stream : streams) {
while (file->can_read_line()) { for (;;) {
auto line = file->read_line(); size_t n = 0;
outln("{}", line.reverse()); errno = 0;
ssize_t buflen = getline(&buffer, &n, stream);
if (buflen == -1) {
if (errno != 0) {
perror("getline");
return 1;
}
break;
}
outln("{}", String { buffer, Chomp }.reverse());
} }
} }