Skip to content

nl: fix output order if stdin and files are mixed #5306

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 24, 2023
Merged

nl: fix output order if stdin and files are mixed #5306

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
20 changes: 7 additions & 13 deletions src/uu/nl/src/nl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,6 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
));
}

let mut read_stdin = false;
let files: Vec<String> = match matches.get_many::<String>(options::FILE) {
Some(v) => v.clone().map(|v| v.to_owned()).collect(),
None => vec!["-".to_owned()],
Expand All @@ -178,21 +177,16 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {

for file in &files {
if file == "-" {
// If both file names and '-' are specified, we choose to treat first all
// regular files, and then read from stdin last.
read_stdin = true;
continue;
let mut buffer = BufReader::new(stdin());
nl(&mut buffer, &mut stats, &settings)?;
} else {
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, &mut stats, &settings)?;
}
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, &mut stats, &settings)?;
}

if read_stdin {
let mut buffer = BufReader::new(stdin());
nl(&mut buffer, &mut stats, &settings)?;
}
Ok(())
}

Expand Down
13 changes: 13 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 @@ -349,6 +349,19 @@ fn test_default_body_numbering_multiple_files() {
.stdout_is(" 1\ta\n 2\tb\n 3\tc\n");
}

#[test]
fn test_default_body_numbering_multiple_files_and_stdin() {
let (at, mut ucmd) = at_and_ucmd!();

at.write("a.txt", "a");
at.write("c.txt", "c");

ucmd.args(&["a.txt", "-", "c.txt"])
.pipe_in("b")
.succeeds()
.stdout_is(" 1\ta\n 2\tb\n 3\tc\n");
}

#[test]
fn test_body_numbering_all_lines_without_delimiter() {
for arg in ["-ba", "--body-numbering=a"] {
Expand Down