ls: use locale-aware collation for name sort

src/uu/ls/Cargo.toml

@@ -36,6 +36,7 @@ uucore = { workspace = true, features = [
   "fs",
   "fsext",
   "fsxattr",
+  "i18n-collator",
   "parser-size",
   "parser-glob",
   "quoting-style",

src/uu/ls/src/ls.rs

@@ -118,6 +118,8 @@ impl UError for LsError {
 pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     let matches = uucore::clap_localization::handle_clap_result_with_exit_code(uu_app(), args, 2)?;
 
+    uucore::i18n::collator::init_locale_collation();
+
     let config = Config::from(&matches)?;
 
     let locs = matches
@@ -1157,7 +1159,18 @@ fn sort_entries(entries: &mut [PathData], config: &Config) {
             entries.sort_unstable_by_key(|k| Reverse(k.metadata().map_or(0, Metadata::len)));
         }
         // The default sort in GNU ls is case insensitive
-        Sort::Name => entries.sort_unstable_by(|a, b| a.display_name().cmp(b.display_name())),
+        Sort::Name => {
+            if uucore::i18n::collator::should_use_locale_collation() {
+                entries.sort_unstable_by(|a, b| {
+                    uucore::i18n::collator::locale_cmp(
+                        os_str_as_bytes_lossy(a.display_name()).as_ref(),
+                        os_str_as_bytes_lossy(b.display_name()).as_ref(),
+                    )
+                });
+            } else {
+                entries.sort_unstable_by(|a, b| a.display_name().cmp(b.display_name()));
+            }
+        }
         Sort::Version => entries.sort_unstable_by(|a, b| {
             version_cmp(
                 os_str_as_bytes_lossy(a.path().as_os_str()).as_ref(),

tests/by-util/test_ls.rs

@@ -2045,6 +2045,26 @@ fn test_ls_sort_name() {
         .stdout_is(".a\n.b\na\nb\n");
 }
 
+// https://github.com/uutils/coreutils/issues/11831
+// In a UTF-8 locale, GNU ls places "." and ".." before names starting with
+// punctuation such as '#' due to locale-aware collation.
+#[test]
+fn test_ls_sort_dot_first_utf8_locale() {
+    let scene = TestScenario::new(util_name!());
+    let at = &scene.fixtures;
+    at.touch("#asdf");
+    at.touch("bar");
+    at.touch("foo");
+
+    scene
+        .ucmd()
+        .env("LANG", "en_US.UTF-8")
+        .env("LC_ALL", "en_US.UTF-8")
+        .arg("-1a")
+        .succeeds()
+        .stdout_is(".\n..\n#asdf\nbar\nfoo\n");
+}
+
 #[test]
 fn test_ls_sort_width() {
     let scene = TestScenario::new(util_name!());