From 8693eaa3b983595943b6dafb18aff630298dbd04 Mon Sep 17 00:00:00 2001 From: anastygnome Date: Sat, 11 Jun 2022 08:41:08 +0200 Subject: [PATCH] Remove unnecessary trailing space when using the comma format (-m) unnecessary trailing space was being added. because we were padding for alignment, which is not required with -m fixes #3608 Signed-off-by: anastygnome --- src/uu/ls/src/ls.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs index 30255b442..0fa748324 100644 --- a/src/uu/ls/src/ls.rs +++ b/src/uu/ls/src/ls.rs @@ -1874,7 +1874,12 @@ fn display_additional_leading_info( } else { "?".to_owned() }; - write!(result, "{} ", pad_left(&s, padding.block_size)).unwrap(); + // extra space is insert to align the sizes, as needed for all formats, except for the comma format. + if config.format == Format::Commas { + write!(result, "{} ", s).unwrap(); + } else { + write!(result, "{} ", pad_left(&s, padding.block_size)).unwrap(); + }; } Ok(result) }