From f84f23ddfefcef4e71c6ada5f7f35383ee0f613f Mon Sep 17 00:00:00 2001
From: Terts Diepraam <terts.diepraam@gmail.com>
Date: Wed, 21 Apr 2021 11:22:10 +0200
Subject: [PATCH] tests/ls: add coverage for special shell character after
 escaped char

---
 src/uu/ls/src/quoting_style.rs | 21 +++++++++++++++++----
 tests/by-util/test_ls.rs       | 15 +++++++++++++++
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/uu/ls/src/quoting_style.rs b/src/uu/ls/src/quoting_style.rs
index 173831ac1..fd5cab57e 100644
--- a/src/uu/ls/src/quoting_style.rs
+++ b/src/uu/ls/src/quoting_style.rs
@@ -27,12 +27,10 @@ pub(super) enum Quotes {
 // This implementation is heavily inspired by the std::char::EscapeDefault implementation
 // in the Rust standard library. This custom implementation is needed because the
 // characters \a, \b, \e, \f & \v are not recognized by Rust.
-#[derive(Clone, Debug)]
 struct EscapedChar {
     state: EscapeState,
 }
 
-#[derive(Clone, Debug)]
 enum EscapeState {
     Done,
     Char(char),
@@ -41,14 +39,12 @@ enum EscapeState {
     Octal(EscapeOctal),
 }
 
-#[derive(Clone, Debug)]
 struct EscapeOctal {
     c: char,
     state: EscapeOctalState,
     idx: usize,
 }
 
-#[derive(Clone, Debug)]
 enum EscapeOctalState {
     Done,
     Backslash,
@@ -510,6 +506,23 @@ mod tests {
             ],
         );
 
+        // A control character followed by a special shell character
+        check_names(
+            "one\n&two",
+            vec![
+                ("one?&two", "literal"),
+                ("one\n&two", "literal-show"),
+                ("one\\n&two", "escape"),
+                ("\"one\\n&two\"", "c"),
+                ("'one?&two'", "shell"),
+                ("'one\n&two'", "shell-show"),
+                ("'one?&two'", "shell-always"),
+                ("'one\n&two'", "shell-always-show"),
+                ("'one'$'\\n''&two'", "shell-escape"),
+                ("'one'$'\\n''&two'", "shell-escape-always"),
+            ],
+        );
+
         // The first 16 control characters. NUL is also included, even though it is of
         // no importance for file names.
         check_names(
diff --git a/tests/by-util/test_ls.rs b/tests/by-util/test_ls.rs
index 75f50b640..001a97d1a 100644
--- a/tests/by-util/test_ls.rs
+++ b/tests/by-util/test_ls.rs
@@ -1190,6 +1190,21 @@ fn test_ls_quoting_style() {
             .succeeds()
             .stdout_only(format!("{}\n", correct));
     }
+
+    // Tests for a character that forces quotation in shell-style escaping
+    // after a character in a dollar expression
+    at.touch("one\n&two");
+    for (arg, correct) in &[
+        ("--quoting-style=shell-escape", "'one'$'\\n''&two'"),
+        ("--quoting-style=shell-escape-always", "'one'$'\\n''&two'"),
+    ] {
+        scene
+            .ucmd()
+            .arg(arg)
+            .arg("one\n&two")
+            .succeeds()
+            .stdout_only(format!("{}\n", correct));
+    }
 }
 
 #[test]