Skip to content

find: print special bits and no padding in -printf %m #891

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: print special bits and no padding in -printf %m #891

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
26 changes: 25 additions & 1 deletion src/find/matchers/printf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ fn format_directive<'entry>(
FormatDirective::Permissions(PermissionsFormat::Octal) => "777".into(),
#[cfg(unix)]
FormatDirective::Permissions(PermissionsFormat::Octal) => {
format!("{:>03o}", meta()?.mode() & 0o777).into()
format!("{:o}", meta()?.mode() & 0o7777).into()
}

FormatDirective::Size => meta()?.len().to_string().into(),
Expand Down Expand Up @@ -1300,4 +1300,28 @@ mod tests {
assert!(matcher.matches(&file_info, &mut deps.new_matcher_io()));
assert_eq!("755 -rwxr-xr-x", deps.get_output_as_string());
}

#[test]
#[cfg(unix)]
fn test_printf_permissions_special_bits() {
use std::fs::File;

let temp_dir = Builder::new().prefix("example").tempdir().unwrap();
let temp_dir_path = temp_dir.path().to_string_lossy();

for (mode, expected) in [(0o4755, "4755 -rwsr-xr-x"), (0o044, "44 ----r--r--")] {

@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.

almost the same code as test_printf_permissions just above
could you please add (0o755, "755 -rwxr-xr-x") here and remove the old test?

let new_file_name = format!("file{mode:o}");
let file = File::create(temp_dir.path().join(&new_file_name)).unwrap();
let mut perms = file.metadata().unwrap().permissions();
perms.set_mode(mode);
file.set_permissions(perms).unwrap();

let file_info = get_dir_entry_for(&temp_dir_path, &new_file_name);
let deps = FakeDependencies::new();

let matcher = Printf::new("%m %M", None).unwrap();
assert!(matcher.matches(&file_info, &mut deps.new_matcher_io()));
assert_eq!(expected, deps.get_output_as_string());
}
}
}
Loading