mirror of
https://github.com/SerenityOS/serenity.git
synced 2025-01-23 18:02:05 -05:00
Userland: Refactor head(1) to not use stdio
This fixes extensive copying data around, and also makes head(1) in bytes mode read exactly as much data as it needs. Also, rename --characters to --bytes: that's exactly what it does (actual character counting is way more complicated), and that's what the option is called in GNU coreutils. Fixes https://github.com/SerenityOS/serenity/issues/6852
This commit is contained in:
parent
d288f6654e
commit
72125827da
1 changed files with 58 additions and 52 deletions
|
@ -4,14 +4,16 @@
|
||||||
* SPDX-License-Identifier: BSD-2-Clause
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <AK/ScopeGuard.h>
|
||||||
#include <AK/StdLibExtras.h>
|
#include <AK/StdLibExtras.h>
|
||||||
#include <LibCore/ArgsParser.h>
|
#include <LibCore/ArgsParser.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
#include <fcntl.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
int head(const String& filename, bool print_filename, int line_count, int char_count);
|
int head(const String& filename, bool print_filename, ssize_t line_count, ssize_t byte_count);
|
||||||
|
|
||||||
int main(int argc, char** argv)
|
int main(int argc, char** argv)
|
||||||
{
|
{
|
||||||
|
@ -20,8 +22,8 @@ int main(int argc, char** argv)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int line_count = 0;
|
int line_count = -1;
|
||||||
int char_count = 0;
|
int byte_count = -1;
|
||||||
bool never_print_filenames = false;
|
bool never_print_filenames = false;
|
||||||
bool always_print_filenames = false;
|
bool always_print_filenames = false;
|
||||||
Vector<const char*> files;
|
Vector<const char*> files;
|
||||||
|
@ -29,13 +31,13 @@ int main(int argc, char** argv)
|
||||||
Core::ArgsParser args_parser;
|
Core::ArgsParser args_parser;
|
||||||
args_parser.set_general_help("Print the beginning ('head') of a file.");
|
args_parser.set_general_help("Print the beginning ('head') of a file.");
|
||||||
args_parser.add_option(line_count, "Number of lines to print (default 10)", "lines", 'n', "number");
|
args_parser.add_option(line_count, "Number of lines to print (default 10)", "lines", 'n', "number");
|
||||||
args_parser.add_option(char_count, "Number of characters to print", "characters", 'c', "number");
|
args_parser.add_option(byte_count, "Number of bytes to print", "bytes", 'c', "number");
|
||||||
args_parser.add_option(never_print_filenames, "Never print filenames", "quiet", 'q');
|
args_parser.add_option(never_print_filenames, "Never print filenames", "quiet", 'q');
|
||||||
args_parser.add_option(always_print_filenames, "Always print filenames", "verbose", 'v');
|
args_parser.add_option(always_print_filenames, "Always print filenames", "verbose", 'v');
|
||||||
args_parser.add_positional_argument(files, "File to process", "file", Core::ArgsParser::Required::No);
|
args_parser.add_positional_argument(files, "File to process", "file", Core::ArgsParser::Required::No);
|
||||||
args_parser.parse(argc, argv);
|
args_parser.parse(argc, argv);
|
||||||
|
|
||||||
if (line_count == 0 && char_count == 0) {
|
if (line_count == -1 && byte_count == -1) {
|
||||||
line_count = 10;
|
line_count = 10;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -46,13 +48,13 @@ int main(int argc, char** argv)
|
||||||
print_filenames = false;
|
print_filenames = false;
|
||||||
|
|
||||||
if (files.is_empty()) {
|
if (files.is_empty()) {
|
||||||
return head("", print_filenames, line_count, char_count);
|
return head("", print_filenames, line_count, byte_count);
|
||||||
}
|
}
|
||||||
|
|
||||||
int rc = 0;
|
int rc = 0;
|
||||||
|
|
||||||
for (auto& file : files) {
|
for (auto& file : files) {
|
||||||
if (head(file, print_filenames, line_count, char_count) != 0) {
|
if (head(file, print_filenames, line_count, byte_count) != 0) {
|
||||||
rc = 1;
|
rc = 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -60,17 +62,22 @@ int main(int argc, char** argv)
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
int head(const String& filename, bool print_filename, int line_count, int char_count)
|
int head(const String& filename, bool print_filename, ssize_t line_count, ssize_t byte_count)
|
||||||
{
|
{
|
||||||
bool is_stdin = false;
|
bool is_stdin = false;
|
||||||
FILE* fp = nullptr;
|
int fd = -1;
|
||||||
|
|
||||||
|
ScopeGuard fd_close_guard = [&fd] {
|
||||||
|
if (fd > 0)
|
||||||
|
close(fd);
|
||||||
|
};
|
||||||
|
|
||||||
if (filename == "" || filename == "-") {
|
if (filename == "" || filename == "-") {
|
||||||
fp = stdin;
|
fd = 0;
|
||||||
is_stdin = true;
|
is_stdin = true;
|
||||||
} else {
|
} else {
|
||||||
fp = fopen(filename.characters(), "r");
|
fd = open(filename.characters(), O_RDONLY);
|
||||||
if (!fp) {
|
if (fd < 0) {
|
||||||
fprintf(stderr, "can't open %s for reading: %s\n", filename.characters(), strerror(errno));
|
fprintf(stderr, "can't open %s for reading: %s\n", filename.characters(), strerror(errno));
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -84,56 +91,55 @@ int head(const String& filename, bool print_filename, int line_count, int char_c
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (line_count) {
|
fflush(stdout);
|
||||||
for (int line = 0; line < line_count; ++line) {
|
|
||||||
char buffer[BUFSIZ];
|
|
||||||
auto* str = fgets(buffer, sizeof(buffer), fp);
|
|
||||||
if (!str)
|
|
||||||
break;
|
|
||||||
|
|
||||||
// specifically use fputs rather than puts, because fputs doesn't add
|
size_t buffer_size = line_count != -1 ? BUFSIZ : min((size_t)BUFSIZ, (size_t)byte_count);
|
||||||
// its own newline.
|
char buffer[buffer_size];
|
||||||
fputs(str, stdout);
|
|
||||||
|
while (line_count > 0 || byte_count > 0) {
|
||||||
|
size_t ntoread = line_count != -1 ? buffer_size : min(buffer_size, (size_t)byte_count);
|
||||||
|
ssize_t nread = read(fd, buffer, ntoread);
|
||||||
|
if (nread < 0) {
|
||||||
|
perror("read");
|
||||||
|
return 1;
|
||||||
|
} else if (nread == 0) {
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
} else if (char_count) {
|
|
||||||
char buffer[BUFSIZ];
|
|
||||||
|
|
||||||
while (char_count) {
|
size_t ntowrite;
|
||||||
int nread = fread(buffer, 1, min(BUFSIZ, char_count), fp);
|
if (byte_count != -1) {
|
||||||
if (nread > 0) {
|
// Write out everything we've read, since we have explicitly ensured
|
||||||
int ncomplete = 0;
|
// that we wouldn't read more than we want to write.
|
||||||
|
ntowrite = nread;
|
||||||
while (ncomplete < nread) {
|
byte_count -= nread;
|
||||||
int nwrote = fwrite(&buffer[ncomplete], 1, nread - ncomplete, stdout);
|
} else {
|
||||||
if (nwrote > 0)
|
// Count line breaks.
|
||||||
ncomplete += nwrote;
|
ntowrite = 0;
|
||||||
|
while (line_count) {
|
||||||
if (feof(stdout)) {
|
const char* newline = strchr(buffer + ntowrite, '\n');
|
||||||
fprintf(stderr, "unexpected eof writing to stdout\n");
|
if (newline) {
|
||||||
return 1;
|
// Found another line break, include this line.
|
||||||
}
|
ntowrite = newline - buffer + 1;
|
||||||
|
line_count--;
|
||||||
if (ferror(stdout)) {
|
} else {
|
||||||
fprintf(stderr, "error writing to stdout\n");
|
// No more line breaks, write the whole thing.
|
||||||
return 1;
|
ntowrite = nread;
|
||||||
}
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
char_count -= nread;
|
size_t ncomplete = 0;
|
||||||
|
while (ncomplete < ntowrite) {
|
||||||
if (feof(fp))
|
ssize_t nwritten = write(1, buffer + ncomplete, ntowrite - ncomplete);
|
||||||
break;
|
if (nwritten < 0) {
|
||||||
|
perror("write");
|
||||||
if (ferror(fp)) {
|
return 1;
|
||||||
fprintf(stderr, "error reading input\n");
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
ncomplete += nwritten;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fclose(fp);
|
|
||||||
|
|
||||||
if (print_filename) {
|
if (print_filename) {
|
||||||
puts("");
|
puts("");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue