From 105024e708830c9121e9cdaac5fd47e2203f4fed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dorian=20P=C3=A9ron?= <dorianperon.i@gmail.com>
Date: Tue, 14 May 2024 00:49:12 +0200
Subject: [PATCH] ls: Fix quoting alignment

---
 src/uu/ls/src/ls.rs      | 18 +++++++++++++++---
 tests/by-util/test_ls.rs |  1 +
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs
index 49768e053..d9bc00de3 100644
--- 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
index 596f1954d..03c8327dd 100644
--- 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")