fs: split get_file_display into its function

uutils · Oct 12, 2023 · 330f69a · 330f69a
1 parent f76b53d
commit 330f69a
Showing 1 changed file with 27 additions and 11 deletions.
diff --git a/src/uucore/src/lib/features/fs.rs b/src/uucore/src/lib/features/fs.rs
@@ -465,6 +465,20 @@ pub fn display_permissions(metadata: &fs::Metadata, display_file_type: bool) ->
  display_permissions_unix(mode, display_file_type)
 }
 
+fn get_file_display(mode: mode_t) -> char {
+ match mode & S_IFMT {
+ S_IFDIR => 'd',
+ S_IFCHR => 'c',
+ S_IFBLK => 'b',
+ S_IFREG => '-',
+ S_IFIFO => 'p',
+ S_IFLNK => 'l',
+ S_IFSOCK => 's',
+ // TODO: Other file types
+ _ => '?',
+ }
+}
+
 // The logic below is more readable written this way.
 #[allow(clippy::if_not_else)]
 #[allow(clippy::cognitive_complexity)]
@@ -474,17 +488,7 @@ pub fn display_permissions_unix(mode: mode_t, display_file_type: bool) -> String
  let mut result;
  if display_file_type {
  result = String::with_capacity(10);
- result.push(match mode & S_IFMT {
- S_IFDIR => 'd',
- S_IFCHR => 'c',
- S_IFBLK => 'b',
- S_IFREG => '-',
- S_IFIFO => 'p',
- S_IFLNK => 'l',
- S_IFSOCK => 's',
- // TODO: Other file types
- _ => '?',
- });
+ result.push(get_file_display(mode));
  } else {
  result = String::with_capacity(9);
  }
@@ -881,4 +885,16 @@ mod tests {
 
  assert!(are_hardlinks_to_same_file(&path1, &path2));
  }
+
+ #[test]
+ fn test_get_file_display() {
+ assert_eq!(get_file_display(S_IFDIR | 0o755), 'd');
+ assert_eq!(get_file_display(S_IFCHR | 0o644), 'c');
+ assert_eq!(get_file_display(S_IFBLK | 0o600), 'b');
+ assert_eq!(get_file_display(S_IFREG | 0o777), '-');
+ assert_eq!(get_file_display(S_IFIFO | 0o666), 'p');
+ assert_eq!(get_file_display(S_IFLNK | 0o777), 'l');
+ assert_eq!(get_file_display(S_IFSOCK | 0o600), 's');
+ assert_eq!(get_file_display(0o777), '?');
+ }
 }