From f6cb1324b630b8b0208efadc789d117557a81189 Mon Sep 17 00:00:00 2001
From: Anup Mahindre <anup.mahindre.7@gmail.com>
Date: Sun, 20 Jun 2021 13:19:50 +0530
Subject: [PATCH] ls: Fix problems dealing with dangling symlinks

- For dangling symlinks, errors should only be reported if
dereferencing options were passed and dereferencing was applicable to
the particular symlink
- With -i parameter, report '?' as the inode number for dangling
symlinks
---
 src/uu/ls/src/ls.rs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs
index 0bffa2e52..677556ab0 100644
--- a/src/uu/ls/src/ls.rs
+++ b/src/uu/ls/src/ls.rs
@@ -1196,7 +1196,9 @@ fn list(locs: Vec<String>, config: Config) -> i32 {
 
     for loc in &locs {
         let p = PathBuf::from(&loc);
-        if !p.exists() {
+        let path_data = PathData::new(p, None, None, &config, true);
+
+        if !path_data.md().is_some() {
             show_error!("'{}': {}", &loc, "No such file or directory");
             /*
             We found an error, the return code of ls should not be 0
@@ -1206,8 +1208,6 @@ fn list(locs: Vec<String>, config: Config) -> i32 {
             continue;
         }
 
-        let path_data = PathData::new(p, None, None, &config, true);
-
         let show_dir_contents = match path_data.file_type() {
             Some(ft) => !config.directory && ft.is_dir(),
             None => {
@@ -1331,7 +1331,7 @@ fn enter_directory(dir: &PathData, config: &Config, out: &mut BufWriter<Stdout>)
 
 fn get_metadata(entry: &Path, dereference: bool) -> std::io::Result<Metadata> {
     if dereference {
-        entry.metadata().or_else(|_| entry.symlink_metadata())
+        entry.metadata()
     } else {
         entry.symlink_metadata()
     }
@@ -1733,7 +1733,11 @@ fn display_file_name(path: &PathData, config: &Config) -> Option<Cell> {
     #[cfg(unix)]
     {
         if config.format != Format::Long && config.inode {
-            name = get_inode(path.md()?) + " " + &name;
+            name = path
+                .md()
+                .map_or_else(|| "?".to_string(), |md| get_inode(md))
+                + " "
+                + &name;
         }
     }