mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 06:07:34 +00:00
rev: Read from stdin if the filename '-' is given
The implementation of `rev` found on Linux systems does not have this behavior, however other utilities do offer this behavior and so there really isn't too much of an argument to be made for *not* having this as a feature.
This commit is contained in:
parent
58d50d2657
commit
b556bfe8eb
1 changed files with 14 additions and 6 deletions
|
@ -28,12 +28,16 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
|
|
||||||
if (!paths.is_empty()) {
|
if (!paths.is_empty()) {
|
||||||
for (auto const& path : paths) {
|
for (auto const& path : paths) {
|
||||||
FILE* stream = fopen(String(path).characters(), "r");
|
if (path == "-") {
|
||||||
if (!stream) {
|
streams.append(stdin);
|
||||||
warnln("Failed to open {}: {}", path, strerror(errno));
|
} else {
|
||||||
continue;
|
FILE* stream = fopen(String(path).characters(), "r");
|
||||||
|
if (!stream) {
|
||||||
|
warnln("Failed to open {}: {}", path, strerror(errno));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
streams.append(stream);
|
||||||
}
|
}
|
||||||
streams.append(stream);
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
streams.append(stdin);
|
streams.append(stdin);
|
||||||
|
@ -43,8 +47,12 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||||
ScopeGuard guard = [&] {
|
ScopeGuard guard = [&] {
|
||||||
free(buffer);
|
free(buffer);
|
||||||
for (auto* stream : streams) {
|
for (auto* stream : streams) {
|
||||||
if (fclose(stream))
|
// If the user passes '-' as an argument multiple times, then we will end up trying to
|
||||||
|
// close stdin multiple times. This will cause `fclose()` to fail but with no error, so
|
||||||
|
// we need to manually check errno.
|
||||||
|
if (fclose(stream) && errno != 0) {
|
||||||
perror("fclose");
|
perror("fclose");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue