ls: Fix quoting alignment

uutils · May 15, 2024 · 105024e · 105024e
1 parent 147c0b6
commit 105024e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs
@@ -2616,12 +2616,24 @@ fn display_grid(
  }
  } else {
  let names = if quoted {
+ // In case some names are quoted, GNU adds a space before each
+ // entry that does not start with a quote to make it prettier
+ // on multiline.
+ //
+ // Example:
+ // ```
+ // $ ls
+ // 'a\nb' bar
+ // foo baz
+ // ^ ^
+ // These spaces is added
+ // ```
  names
  .map(|n| {
- if n.starts_with('\'') {
- format!(" {n}")
- } else {
+ if n.starts_with('\'') || n.starts_with('"') {
  n
+ } else {
+ format!(" {n}")
  }
  })
  .collect()

diff --git a/tests/by-util/test_ls.rs b/tests/by-util/test_ls.rs
@@ -2961,6 +2961,7 @@ fn test_ls_align_unquoted() {
  at.touch("'quoted'");
 
  // In TTY
+ #[cfg(unix)]
  scene
  .ucmd()
  .arg("--color")