Skip to content
Closed
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
16 changes: 16 additions & 0 deletions src/uu/numfmt/src/format.rs
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,22 @@ pub fn format_and_print_delimited(input: &[u8], options: &NumfmtOptions) -> Resu
b'\n'
};

// Empty delimiter means treat entire line as single field
if delimiter.is_empty() {
if uucore::ranges::contain(&options.fields, 1) {
let input_str = std::str::from_utf8(input)
.map_err(|_| translate!("numfmt-error-invalid-number", "input" => String::from_utf8_lossy(input).into_owned().quote()))?
.trim_start();
let formatted = format_string(input_str, options, None)?;
output.extend_from_slice(formatted.as_bytes());
} else {
output.extend_from_slice(input);
}
output.push(eol);
std::io::Write::write_all(&mut std::io::stdout(), &output).map_err(|e| e.to_string())?;
return Ok(());
}

for (n, field) in (1..).zip(split_bytes(input, delimiter)) {
let field_selected = uucore::ranges::contain(&options.fields, n);

Expand Down
9 changes: 9 additions & 0 deletions tests/by-util/test_numfmt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1147,3 +1147,12 @@ fn test_unit_separator() {
new_ucmd!().args(args).succeeds().stdout_only(expected);
}
}

#[test]
fn test_empty_delimiter() {
// Empty delimiter treats entire line as single field
new_ucmd!()
.args(&["-d", "", "--from=auto", "40M"])
.succeeds()
.stdout_only("40000000\n");
}
Loading