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

nl: Don't output a new line on empty file

Browse source
This commit is contained in:
Lucas CHOLLET 2023-06-07 11:12:50 -04:00 • committed by Andreas Kling
parent bccd12f297
commit aa8b8ddd57
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Utilities/nl.cpp
View file

@ -68,10 +68,10 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto file = maybe_file.release_value(); auto file = maybe_file.release_value();
int line_number = start_number - increment; // so the line number can start at 1 when added below int line_number = start_number - increment; // so the line number can start at 1 when added below
int previous_character = 0; Optional<u8> previous_character;
u8 next_character; u8 next_character;
for (Bytes bytes = TRY(file->read_some({ &next_character, 1 })); bytes.size() != 0; bytes = TRY(file->read_some(bytes))) { for (Bytes bytes = TRY(file->read_some({ &next_character, 1 })); bytes.size() != 0; bytes = TRY(file->read_some(bytes))) {
if (previous_character == 0 || previous_character == '\n') { if (!previous_character.has_value() || previous_character == '\n') {
if (next_character == '\n' && number_style != NumberAllLines) { if (next_character == '\n' && number_style != NumberAllLines) {
// Skip printing line count on empty lines. // Skip printing line count on empty lines.
outln(); outln();
@ -86,7 +86,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
previous_character = next_character; previous_character = next_character;
} }
if (previous_character != '\n') if (previous_character.has_value() && previous_character != '\n')
outln(); // for cases where files have no trailing newline outln(); // for cases where files have no trailing newline
} }
return 0; return 0;