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

tail: Don't skip the last line if it doesn't end in a newline

Browse source
This commit is contained in:
Tim Ledbetter 2023-05-20 06:54:39 +01:00 • committed by Andreas Kling
parent 51b91af60b
commit daa9812cea
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Userland/Utilities/tail.cpp
View file

@ -70,6 +70,9 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto buffer = TRY(f->read_until_eof(PAGE_SIZE)); auto buffer = TRY(f->read_until_eof(PAGE_SIZE));
auto line_count = StringView(buffer).count("\n"sv); auto line_count = StringView(buffer).count("\n"sv);
auto bytes = buffer.bytes(); auto bytes = buffer.bytes();
if (bytes.size() > 0 && bytes.last() != '\n')
line_count++;
size_t line_index = 0; size_t line_index = 0;
StringBuilder line; StringBuilder line;
@ -81,7 +84,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
for (size_t i = 0; i < bytes.size(); i++) { for (size_t i = 0; i < bytes.size(); i++) {
auto ch = bytes.at(i); auto ch = bytes.at(i);
line.append(ch); line.append(ch);
if (ch == '\n') { if (ch == '\n' || i == bytes.size() - 1) {
if (wanted_line_count > line_count || line_index >= line_count - wanted_line_count) if (wanted_line_count > line_count || line_index >= line_count - wanted_line_count)
out("{}", line.to_deprecated_string()); out("{}", line.to_deprecated_string());
line_index++; line_index++;