mirror of
https://github.com/uutils/coreutils.git
synced 2026-06-10 15:48:22 -07:00
Merge pull request #5155 from cakebaker/nl_no_renumber
nl: re-add handling for -p/--no-renumber
This commit is contained in:
+3
-1
@@ -297,7 +297,9 @@ fn nl<T: Read>(reader: &mut BufReader<T>, 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 {
|
||||
|
||||
@@ -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");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user