Skip to content

nl: defer showing "line number overflow" error #5340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 30, 2023
Merged

nl: defer showing "line number overflow" error #5340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/uu/nl/src/nl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@ impl Default for Settings {
}

struct Stats {
line_number: i64,
line_number: Option<i64>,
consecutive_empty_lines: u64,
}

impl Stats {
fn new(starting_line_number: i64) -> Self {
Self {
line_number: starting_line_number,
line_number: Some(starting_line_number),
consecutive_empty_lines: 0,
}
}
Expand Down Expand Up @@ -344,7 +344,7 @@ fn nl<T: Read>(reader: &mut BufReader<T>, stats: &mut Stats, settings: &Settings
if let Some(new_style) = new_numbering_style {
current_numbering_style = new_style;
if settings.renumber {
stats.line_number = settings.starting_line_number;
stats.line_number = Some(settings.starting_line_number);
}
println!();
} else {
Expand All @@ -364,18 +364,21 @@ fn nl<T: Read>(reader: &mut BufReader<T>, stats: &mut Stats, settings: &Settings
};

if is_line_numbered {
let Some(line_number) = stats.line_number else {
return Err(USimpleError::new(1, "line number overflow"));
};
println!(
"{}{}{}",
settings
.number_format
.format(stats.line_number, settings.number_width),
.format(line_number, settings.number_width),
settings.number_separator,
line
);
// update line number for the potential next line
match stats.line_number.checked_add(settings.line_increment) {
Some(new_line_number) => stats.line_number = new_line_number,
None => return Err(USimpleError::new(1, "line number overflow")),
match line_number.checked_add(settings.line_increment) {
Some(new_line_number) => stats.line_number = Some(new_line_number),
None => stats.line_number = None, // overflow
}
} else {
let spaces = " ".repeat(settings.number_width + 1);
Expand Down
16 changes: 16 additions & 0 deletions tests/by-util/test_nl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,22 @@ fn test_line_number_overflow() {
.stderr_is("nl: line number overflow\n");
}

#[test]
fn test_line_number_no_overflow() {
new_ucmd!()
.arg(format!("--starting-line-number={}", i64::MAX))
.pipe_in("a\n\\:\\:\nb")
.succeeds()
.stdout_is(format!("{0}\ta\n\n{0}\tb\n", i64::MAX));

new_ucmd!()
.arg(format!("--starting-line-number={}", i64::MIN))
.arg("--line-increment=-1")
.pipe_in("a\n\\:\\:\nb")
.succeeds()
.stdout_is(format!("{0}\ta\n\n{0}\tb\n", i64::MIN));
}

#[test]
fn test_section_delimiter() {
for arg in ["-dabc", "--section-delimiter=abc"] {
Expand Down