ls: when -aA are provided, the order matters

uutils · Mar 20, 2022 · 15d176b · 15d176b
1 parent 04b219b
commit 15d176b
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs
@@ -422,11 +422,27 @@ impl Config {
             }
         }
 
-        let files = if options.is_present(options::files::ALL) {
+        let files = if options.is_present(options::files::ALL)
+            && options.is_present(options::files::ALMOST_ALL)
+        {
+            // OK, both arguments (a & A) are provided.
+            // in this case, the order matters
+            if options.index_of(options::files::ALL) > options.index_of(options::files::ALMOST_ALL)
+            {
+                // -Aa
+                Files::All
+            } else {
+                // -aA
+                Files::AlmostAll
+            }
+        } else if options.is_present(options::files::ALL) {
+            // -a
             Files::All
         } else if options.is_present(options::files::ALMOST_ALL) {
+            // -A
             Files::AlmostAll
         } else {
+            // Neither
             Files::Normal
         };
 

diff --git a/tests/by-util/test_ls.rs b/tests/by-util/test_ls.rs
@@ -2869,3 +2869,25 @@ fn test_ls_context_format() {
             );
     }
 }
+
+#[test]
+#[allow(non_snake_case)]
+fn test_ls_a_A() {
+    let scene = TestScenario::new(util_name!());
+
+    scene
+        .ucmd()
+        .arg("-A")
+        .arg("-a")
+        .succeeds()
+        .stdout_contains(".")
+        .stdout_contains("..");
+
+    scene
+        .ucmd()
+        .arg("-a")
+        .arg("-A")
+        .succeeds()
+        .stdout_does_not_contain(".")
+        .stdout_does_not_contain("..");
+}