Skip to content

find: show the file type and special bits in -ls #892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
youdie006 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

find: show the file type and special bits in -ls #892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 2 additions & 95 deletions src/find/matchers/ls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,77 +11,6 @@ use std::{

use super::{Matcher, MatcherIO, WalkEntry};

#[cfg(unix)]
fn format_permissions(mode: uucore::libc::mode_t) -> String {
let file_type = match mode & (uucore::libc::S_IFMT as uucore::libc::mode_t) {
uucore::libc::S_IFDIR => "d",
uucore::libc::S_IFREG => "-",
_ => "?",
};

// S_$$USR means "user permissions"
let user_perms = format!(
"{}{}{}",
if mode & uucore::libc::S_IRUSR != 0 {
"r"
} else {
"-"
},
if mode & uucore::libc::S_IWUSR != 0 {
"w"
} else {
"-"
},
if mode & uucore::libc::S_IXUSR != 0 {
"x"
} else {
"-"
}
);

// S_$$GRP means "group permissions"
let group_perms = format!(
"{}{}{}",
if mode & uucore::libc::S_IRGRP != 0 {
"r"
} else {
"-"
},
if mode & uucore::libc::S_IWGRP != 0 {
"w"
} else {
"-"
},
if mode & uucore::libc::S_IXGRP != 0 {
"x"
} else {
"-"
}
);

// S_$$OTH means "other permissions"
let other_perms = format!(
"{}{}{}",
if mode & uucore::libc::S_IROTH != 0 {
"r"
} else {
"-"
},
if mode & uucore::libc::S_IWOTH != 0 {
"w"
} else {
"-"
},
if mode & uucore::libc::S_IXOTH != 0 {
"x"
} else {
"-"
}
);

format!("{}{}{}{}", file_type, user_perms, group_perms, other_perms)
}

#[cfg(windows)]
fn format_permissions(file_attributes: u32) -> String {
let mut attributes = Vec::new();
Expand Down Expand Up @@ -126,7 +55,7 @@ impl Ls {
mut out: impl Write,
print_error_message: bool,
) {
use std::os::unix::fs::{MetadataExt, PermissionsExt};
use std::os::unix::fs::MetadataExt;

let metadata = file_info.metadata().unwrap();

Expand All @@ -146,8 +75,7 @@ impl Ls {
number_of_blocks + (4 - (remainder))
}
};
let permission =
{ format_permissions(metadata.permissions().mode() as uucore::libc::mode_t) };
let permission = uucore::fs::display_permissions(metadata, true);
let hard_links = metadata.nlink();
// Fall back to the numeric id when the uid/gid has no passwd/group entry
// (unmapped owner) — matching GNU find, which never crashes. uucore::entries
Expand Down Expand Up @@ -286,24 +214,3 @@ impl Matcher for Ls {
true
}
}

#[cfg(test)]
mod tests {
#[test]
#[cfg(unix)]
fn test_format_permissions() {
use super::format_permissions;

let mode: uucore::libc::mode_t = 0o100_644;
let expected = "-rw-r--r--";
assert_eq!(format_permissions(mode), expected);

let mode: uucore::libc::mode_t = 0o040_755;
let expected = "drwxr-xr-x";
assert_eq!(format_permissions(mode), expected);

let mode: uucore::libc::mode_t = 0o100_777;
let expected = "-rwxrwxrwx";
assert_eq!(format_permissions(mode), expected);
}
}
18 changes: 18 additions & 0 deletions tests/test_find.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1385,6 +1385,24 @@ fn find_ls() {
.no_stderr();
}

#[test]
#[cfg(unix)]
fn find_ls_shows_file_type_and_special_bits() {
use std::os::unix::fs::PermissionsExt;

let temp_dir = Builder::new().prefix("find_ls_modes").tempdir().unwrap();
let file = temp_dir.path().join("setuid");
File::create(&file).unwrap();
fs::set_permissions(&file, fs::Permissions::from_mode(0o4755)).unwrap();
symlink("setuid", temp_dir.path().join("link")).unwrap();

@sylvestre sylvestre Oct 2, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you please also add a 1777 directory, to cover the sticky bit (drwxrwxrwt)?


ucmd()
.args(&[temp_dir.path().to_str().unwrap(), "-ls"])
.succeeds()
.stdout_contains(" -rwsr-xr-x ")
.stdout_contains(" lrwx");
}

// Regression test for uutils/findutils#717: `-ls` used to abort (exit 101) when
// a file's owning uid/gid had no passwd/group entry; it must fall back to the
// numeric id like GNU find. Creating such a file needs privilege to chown to an
Expand Down
Loading