ls: correct the order of custom time formats

src/uu/ls/src/config.rs

@@ -1130,13 +1130,13 @@ fn parse_time_style(options: &clap::ArgMatches) -> Result<(String, Option<String
                 // `field` can be empty here (e.g. --time-style=posix-), so test
                 // the prefix instead of unwrapping the first char.
                 _ if field.starts_with('+') => {
-                    // recent/older formats are (optionally) separated by a newline
+                    // The non-recent format comes first, followed by the recent format.
                     let mut it = field[1..].split('\n');
-                    let recent = it.next().unwrap_or_default();
-                    let older = it.next();
-                    match it.next() {
-                        None => ok((recent, older)),
-                        Some(_) => Err(LsError::TimeStyleParseError(String::from(field))),
+                    let older = it.next().unwrap_or_default();
+                    match (it.next(), it.next()) {
+                        (None, None) => ok((older, None)),
+                        (Some(recent), None) => ok((recent, Some(older))),
+                        (_, Some(_)) => Err(LsError::TimeStyleParseError(String::from(field))),
                     }
                 }
                 _ => Err(LsError::TimeStyleParseError(String::from(field))),

tests/by-util/test_ls.rs

@@ -2397,13 +2397,13 @@ fn test_ls_time_styles() {
         .stdout_matches(&re_custom_format_recent)
         .stdout_matches(&re_custom_format_old);
 
-    //+FORMAT_RECENT\nFORMAT_OLD
+    //+FORMAT_OLD\nFORMAT_RECENT
     let re_custom_format_old =
         Regex::new(r"[a-z-]* \d* [\w.]* [\w.]* \d* \d{4}--\d{2} test-old\n").unwrap();
     scene
         .ucmd()
         .arg("-l")
-        .arg("--time-style=+%Y__%M\n%Y--%M")
+        .arg("--time-style=+%Y--%M\n%Y__%M")
         .succeeds()
         .stdout_matches(&re_custom_format_recent)
         .stdout_matches(&re_custom_format_old);
@@ -2419,7 +2419,7 @@ fn test_ls_time_styles() {
     scene
         .ucmd()
         .arg("-l")
-        .arg("--time-style=+%Y__%M\n%Y--%M\n")
+        .arg("--time-style=+%Y--%M\n%Y__%M\n")
         .fails_with_code(2);
 
     //Overwrite options tests
@@ -2534,12 +2534,12 @@ fn test_ls_time_recent_future() {
         .stdout_matches(&re_iso_old);
 
     // Also test that we can set a format that varies for recent of older files.
-    //+FORMAT_RECENT\nFORMAT_OLD
+    //+FORMAT_OLD\nFORMAT_RECENT
     f.set_modified(SystemTime::now()).unwrap();
     scene
         .ucmd()
         .arg("-l")
-        .arg("--time-style=+RECENT\nOLD")
+        .arg("--time-style=+OLD\nRECENT")
         .succeeds()
         .stdout_contains("RECENT");
 
@@ -2549,7 +2549,7 @@ fn test_ls_time_recent_future() {
     scene
         .ucmd()
         .arg("-l")
-        .arg("--time-style=+RECENT\nOLD")
+        .arg("--time-style=+OLD\nRECENT")
         .succeeds()
         .stdout_contains("OLD");
 
@@ -8250,3 +8250,42 @@ ls: invalid --block-size argument '1fb'
             .stderr_is("ls: invalid --block-size argument '1fb'\n");
     }
 }
+
+#[test]
+fn test_ls_custom_time_style_recent_and_older() {
+    let scene = TestScenario::new(util_name!());
+    scene.fixtures.touch("recent");
+    scene
+        .fixtures
+        .make_file("older")
+        .set_modified(std::time::UNIX_EPOCH)
+        .unwrap();
+
+    for (style, expected_recent, expected_older) in [
+        ("+OLD\nNEW", "NEW", "OLD"),
+        ("+\nNEW", "NEW", ""),
+        ("+OLD\n", "", "OLD"),
+        ("+SAME", "SAME", "SAME"),
+    ] {
+        for use_env in [false, true] {
+            for (file, expected) in [("recent", expected_recent), ("older", expected_older)] {
+                let mut cmd = scene.ucmd();
+                cmd.arg("-ln");
+                if use_env {
+                    cmd.env("TIME_STYLE", style);
+                } else {
+                    cmd.arg(format!("--time-style={style}"));
+                }
+                let result = cmd.arg(file).succeeds();
+                let fields: Vec<_> = result.stdout_str().split_ascii_whitespace().collect();
+                assert_eq!(fields.last(), Some(&file), "unexpected output: {fields:?}");
+                if expected.is_empty() {
+                    assert_eq!(fields.len(), 6, "unexpected output: {fields:?}");
+                } else {
+                    assert_eq!(fields.len(), 7, "unexpected output: {fields:?}");
+                    assert_eq!(fields[5], expected, "unexpected output: {fields:?}");
+                }
+            }
+        }
+    }
+}