From d6248279133a001f66d6c2138a0ffbbb8f3f36fb Mon Sep 17 00:00:00 2001
From: Terts Diepraam <terts.diepraam@gmail.com>
Date: Thu, 29 Apr 2021 18:44:46 +0200
Subject: [PATCH] ls: fix windows and add more file types

---
 src/uu/ls/src/ls.rs | 48 ++++++++++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs
index 777f16e7f..adfc654ba 100644
--- a/src/uu/ls/src/ls.rs
+++ b/src/uu/ls/src/ls.rs
@@ -1621,20 +1621,23 @@ fn format_prefixed(prefixed: NumberPrefix<f64>) -> String {
 }
 
 fn display_file_size(metadata: &Metadata, config: &Config) -> String {
+    #[cfg(unix)]
+    {
+        let ft = metadata.file_type();
+        if ft.is_char_device() || ft.is_block_device() {
+            let dev: u64 = metadata.rdev();
+            let major = (dev >> 8) as u8;
+            let minor = dev as u8;
+            return format!("{}, {}", major, minor);
+        }
+    }
+
     // NOTE: The human-readable behaviour deviates from the GNU ls.
     // The GNU ls uses binary prefixes by default.
-    let ft = metadata.file_type();
-    if ft.is_char_device() || ft.is_block_device() {
-        let dev: u64 = metadata.rdev();
-        let major = (dev >> 8) as u8;
-        let minor = dev as u8;
-        return format!("{}, {}", major, minor);
-    } else {
-        match config.size_format {
-            SizeFormat::Binary => format_prefixed(NumberPrefix::binary(metadata.len() as f64)),
-            SizeFormat::Decimal => format_prefixed(NumberPrefix::decimal(metadata.len() as f64)),
-            SizeFormat::Bytes => metadata.len().to_string(),
-        }
+    match config.size_format {
+        SizeFormat::Binary => format_prefixed(NumberPrefix::binary(metadata.len() as f64)),
+        SizeFormat::Decimal => format_prefixed(NumberPrefix::decimal(metadata.len() as f64)),
+        SizeFormat::Bytes => metadata.len().to_string(),
     }
 }
 
@@ -1643,11 +1646,24 @@ fn display_file_type(file_type: FileType) -> char {
         'd'
     } else if file_type.is_symlink() {
         'l'
-    } else if file_type.is_block_device() {
-        'b'
-    } else if file_type.is_char_device() {
-        'c'
     } else {
+        #[cfg(unix)]
+        {
+            if file_type.is_block_device() {
+                'b'
+            } else if file_type.is_char_device() {
+                'c'
+            } else if file_type.is_fifo() {
+                'p'
+            } else if file_type.is_socket() {
+                's'
+            } else if file_type.is_file() {
+                '-'
+            } else {
+                '?'
+            }
+        }
+        #[cfg(not(unix))]
         '-'
     }
 }