Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-11-17 02:08:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixup! wc: rm leading space when printing multiple counts

Browse source
This commit is contained in:
Jeffrey Finkelstein 2021-05-07 13:59:31 -04:00 committed by Sylvestre Ledru
parent 525f71bada
commit ee43655bdb
1 changed files with 19 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/uu/wc/src/wc.rs
View file

@ -372,51 +372,42 @@ fn print_stats(
let mut is_first: bool = true;
if settings.show_lines {
if is_first {
write!(stdout_lock, "{:1$}", result.count.lines, min_width)?;
} else {
write!(stdout_lock, " {:1$}", result.count.lines, min_width)?;
if !is_first {
write!(stdout_lock, " ")?;
}
write!(stdout_lock, "{:1$}", result.count.lines, min_width)?;
is_first = false;
}
if settings.show_words {
if is_first {
write!(stdout_lock, "{:1$}", result.count.words, min_width)?;
} else {
write!(stdout_lock, " {:1$}", result.count.words, min_width)?;
if !is_first {
write!(stdout_lock, " ")?;
}
write!(stdout_lock, "{:1$}", result.count.words, min_width)?;
is_first = false;
}
if settings.show_bytes {
if is_first {
write!(stdout_lock, "{:1$}", result.count.bytes, min_width)?;
} else {
write!(stdout_lock, " {:1$}", result.count.bytes, min_width)?;
if !is_first {
write!(stdout_lock, " ")?;
}
write!(stdout_lock, "{:1$}", result.count.bytes, min_width)?;
is_first = false;
}
if settings.show_chars {
if is_first {
write!(stdout_lock, "{:1$}", result.count.chars, min_width)?;
} else {
write!(stdout_lock, " {:1$}", result.count.chars, min_width)?;
if !is_first {
write!(stdout_lock, " ")?;
}
write!(stdout_lock, "{:1$}", result.count.chars, min_width)?;
is_first = false;
}
if settings.show_max_line_length {
if is_first {
write!(
stdout_lock,
"{:1$}",
result.count.max_line_length, min_width
)?;
} else {
write!(
stdout_lock,
" {:1$}",
result.count.max_line_length, min_width
)?;
if !is_first {
write!(stdout_lock, " ")?;
}
write!(
stdout_lock,
"{:1$}",
result.count.max_line_length, min_width
)?;
}
if result.title == "-" {