From 08e21e183b6952e21824f492e5d21a5526fac513 Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Sat, 12 Aug 2023 14:36:22 +0200 Subject: [PATCH] nl: re-add handling for -p/--no-renumber --- src/uu/nl/src/nl.rs | 4 +++- tests/by-util/test_nl.rs | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/uu/nl/src/nl.rs b/src/uu/nl/src/nl.rs index 85ddb1b41..95121eb08 100644 --- a/src/uu/nl/src/nl.rs +++ b/src/uu/nl/src/nl.rs @@ -297,7 +297,9 @@ fn nl(reader: &mut BufReader, settings: &Settings) -> UResult<()> { if let Some(new_style) = new_numbering_style { current_numbering_style = new_style; - line_no = settings.starting_line_number; + if settings.renumber { + line_no = settings.starting_line_number; + } println!(); } else { let is_line_numbered = match current_numbering_style { diff --git a/tests/by-util/test_nl.rs b/tests/by-util/test_nl.rs index ab27fe148..fb04ba9ae 100644 --- a/tests/by-util/test_nl.rs +++ b/tests/by-util/test_nl.rs @@ -77,7 +77,11 @@ fn test_sections_and_styles() { #[test] fn test_no_renumber() { for arg in ["-p", "--no-renumber"] { - new_ucmd!().arg(arg).succeeds(); + new_ucmd!() + .arg(arg) + .pipe_in("a\n\\:\\:\nb") + .succeeds() + .stdout_is(" 1\ta\n\n 2\tb\n"); } }