RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

wc: Make output width more consistent with GNU

Browse source
This commit is contained in:
Jan Verbeek 2021-08-25 15:29:08 +02:00 • committed by Michael Debertol
parent d0c0564947
commit c16e492cd0
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -324,9 +324,9 @@ fn show_error(input: &Input, err: io::Error) {
/// let input = Input::Stdin(StdinKind::Explicit); /// let input = Input::Stdin(StdinKind::Explicit);
/// assert_eq!(7, digit_width(input)); /// assert_eq!(7, digit_width(input));
/// ``` /// ```
fn digit_width(input: &Input) -> io::Result<Option<usize>> { fn digit_width(input: &Input) -> io::Result<usize> {
match input { match input {
Input::Stdin(_) => Ok(Some(MINIMUM_WIDTH)), Input::Stdin(_) => Ok(MINIMUM_WIDTH),
Input::Path(filename) => { Input::Path(filename) => {
let path = Path::new(filename); let path = Path::new(filename);
let metadata = fs::metadata(path)?; let metadata = fs::metadata(path)?;
@ -337,9 +337,9 @@ fn digit_width(input: &Input) -> io::Result<Option<usize>> {
// instead). See GitHub issue #2201. // instead). See GitHub issue #2201.
let num_bytes = metadata.len(); let num_bytes = metadata.len();
let num_digits = num_bytes.to_string().len(); let num_digits = num_bytes.to_string().len();
Ok(Some(num_digits)) Ok(num_digits)
} else { } else {
Ok(None) Ok(MINIMUM_WIDTH)
} }
} }
} }
@ -377,7 +377,7 @@ fn digit_width(input: &Input) -> io::Result<Option<usize>> {
fn max_width(inputs: &[Input]) -> usize { fn max_width(inputs: &[Input]) -> usize {
let mut result = 1; let mut result = 1;
for input in inputs { for input in inputs {
if let Ok(Some(n)) = digit_width(input) { if let Ok(n) = digit_width(input) {
result = result.max(n); result = result.max(n);
} }
} }