RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2026-01-16 18:21:01 +00:00
Code Issues Activity

Merge pull request #5285 from cakebaker/nl_multiple_files

Browse source 
nl: make line number and --join-blank-lines work over multiple files
This commit is contained in:
Sylvestre Ledru 2023-09-23 09:34:04 +02:00 • committed by GitHub
commit ba3f266b2c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 64 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/uu/nl/src/nl.rs
View file

@ -55,6 +55,20 @@ impl Default for Settings {
}
}
struct Stats {
line_number: i64,
consecutive_empty_lines: u64,
}
impl Stats {
fn new(starting_line_number: i64) -> Self {
Self {
line_number: starting_line_number,
consecutive_empty_lines: 0,
}
}
}
// NumberingStyle stores which lines are to be numbered.
// The possible options are:
// 1. Number all lines
@ -160,6 +174,8 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
None => vec!["-".to_owned()],
};
let mut stats = Stats::new(settings.starting_line_number);
for file in &files {
if file == "-" {
// If both file names and '-' are specified, we choose to treat first all
@ -170,12 +186,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
let path = Path::new(file);
let reader = File::open(path).map_err_context(|| file.to_string())?;
let mut buffer = BufReader::new(reader);
nl(&mut buffer, &settings)?;
nl(&mut buffer, &mut stats, &settings)?;
}
if read_stdin {
let mut buffer = BufReader::new(stdin());
nl(&mut buffer, &settings)?;
nl(&mut buffer, &mut stats, &settings)?;
}
Ok(())
}
@ -285,18 +301,16 @@ pub fn uu_app() -> Command {
}
// nl implements the main functionality for an individual buffer.
fn nl<T: Read>(reader: &mut BufReader<T>, settings: &Settings) -> UResult<()> {
fn nl<T: Read>(reader: &mut BufReader<T>, stats: &mut Stats, settings: &Settings) -> UResult<()> {
let mut current_numbering_style = &settings.body_numbering;
let mut line_no = settings.starting_line_number;
let mut consecutive_empty_lines = 0;
for line in reader.lines() {
let line = line.map_err_context(|| "could not read line".to_string())?;
if line.is_empty() {
consecutive_empty_lines += 1;
stats.consecutive_empty_lines += 1;
} else {
consecutive_empty_lines = 0;
stats.consecutive_empty_lines = 0;
};
// FIXME section delimiters are hardcoded and settings.section_delimiter is ignored
@ -312,7 +326,7 @@ fn nl<T: Read>(reader: &mut BufReader<T>, settings: &Settings) -> UResult<()> {
if let Some(new_style) = new_numbering_style {
current_numbering_style = new_style;
if settings.renumber {
line_no = settings.starting_line_number;
stats.line_number = settings.starting_line_number;
}
println!();
} else {
@ -321,7 +335,7 @@ fn nl<T: Read>(reader: &mut BufReader<T>, settings: &Settings) -> UResult<()> {
// for numbering, and only number the last one
NumberingStyle::All
if line.is_empty()
&& consecutive_empty_lines % settings.join_blank_lines != 0 =>
&& stats.consecutive_empty_lines % settings.join_blank_lines != 0 =>
{
false
}
@ -336,13 +350,13 @@ fn nl<T: Read>(reader: &mut BufReader<T>, settings: &Settings) -> UResult<()> {
"{}{}{}",
settings
.number_format
.format(line_no, settings.number_width),
.format(stats.line_number, settings.number_width),
settings.number_separator,
line
);
// update line number for the potential next line
match line_no.checked_add(settings.line_increment) {
Some(new_line_no) => line_no = new_line_no,
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")),
}
} else {