Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/uu/nl/locales/en-US.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ nl-help-number-width = use NUMBER columns for line numbers
# Error messages
nl-error-invalid-arguments = Invalid arguments supplied.
nl-error-could-not-read-line = could not read line
nl-error-could-not-write = could not write output
nl-error-line-number-overflow = line number overflow
nl-error-invalid-line-width = Invalid line number field width: ‘{ $value }’: Numerical result out of range
nl-error-invalid-regex = invalid regular expression
Expand Down
1 change: 1 addition & 0 deletions src/uu/nl/locales/fr-FR.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ nl-help-number-width = utiliser NUMBER colonnes pour les numéros de ligne
# Messages d'erreur
nl-error-invalid-arguments = Arguments fournis invalides.
nl-error-could-not-read-line = impossible de lire la ligne
nl-error-could-not-write = impossible d'écrire la sortie
nl-error-line-number-overflow = débordement du numéro de ligne
nl-error-invalid-line-width = Largeur de champ de numéro de ligne invalide : ‘{ $value }’ : Résultat numérique hors limites
nl-error-invalid-regex = expression régulière invalide
Expand Down
17 changes: 12 additions & 5 deletions src/uu/nl/src/nl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use clap::{Arg, ArgAction, Command};
use std::ffi::{OsStr, OsString};
use std::fs::File;
use std::io::{BufRead, BufReader, Read, stdin};
use std::io::{BufRead, BufReader, BufWriter, Read, Write, stdin, stdout};
use std::path::Path;
use uucore::error::{FromIo, UResult, USimpleError, set_exit_code};
use uucore::{format_usage, show_error, translate};
Expand Down Expand Up @@ -346,6 +346,7 @@ pub fn uu_app() -> Command {

/// `nl` implements the main functionality for an individual buffer.
fn nl<T: Read>(reader: &mut BufReader<T>, stats: &mut Stats, settings: &Settings) -> UResult<()> {
let mut writer = BufWriter::new(stdout());
let mut current_numbering_style = &settings.body_numbering;
let mut line = Vec::new();

Expand Down Expand Up @@ -382,7 +383,7 @@ fn nl<T: Read>(reader: &mut BufReader<T>, stats: &mut Stats, settings: &Settings
if settings.renumber {
stats.line_number = Some(settings.starting_line_number);
}
println!();
writeln!(writer).map_err_context(|| translate!("nl-error-could-not-write"))?;
} else {
let is_line_numbered = match current_numbering_style {
// consider $join_blank_lines consecutive empty lines to be one logical line
Expand All @@ -407,25 +408,31 @@ fn nl<T: Read>(reader: &mut BufReader<T>, stats: &mut Stats, settings: &Settings
translate!("nl-error-line-number-overflow"),
));
};
println!(
writeln!(
writer,
"{}{}{}",
settings
.number_format
.format(line_number, settings.number_width),
settings.number_separator.to_string_lossy(),
String::from_utf8_lossy(&line),
);
)
.map_err_context(|| translate!("nl-error-could-not-write"))?;
// update line number for the potential next line
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);
println!("{spaces}{}", String::from_utf8_lossy(&line));
writeln!(writer, "{spaces}{}", String::from_utf8_lossy(&line))
.map_err_context(|| translate!("nl-error-could-not-write"))?;
}
}
}
writer
.flush()
.map_err_context(|| translate!("nl-error-could-not-write"))?;
Ok(())
}

Expand Down
Loading