Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-12-12 14:22:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6891 from cakebaker/uucore_perms_fix_todo

Browse source 
uucore/perms: use ORs instead of `match` (fix todo)
This commit is contained in:
Sylvestre Ledru 2024-12-02 10:01:10 +01:00 committed by GitHub
commit 9dec29f613
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/uucore/src/lib/features/perms.rs
View file

@ -23,7 +23,7 @@ use std::fs::Metadata;
use std::os::unix::fs::MetadataExt; use std::os::unix::fs::MetadataExt;
use std::os::unix::ffi::OsStrExt; use std::os::unix::ffi::OsStrExt;
use std::path::{Path, MAIN_SEPARATOR_STR}; use std::path::{Path, MAIN_SEPARATOR};
/// The various level of verbosity /// The various level of verbosity
#[derive(PartialEq, Eq, Clone, Debug)] #[derive(PartialEq, Eq, Clone, Debug)]
@ -214,23 +214,13 @@ fn is_root(path: &Path, would_traverse_symlink: bool) -> bool {
// We cannot check path.is_dir() here, as this would resolve symlinks, // We cannot check path.is_dir() here, as this would resolve symlinks,
// which we need to avoid here. // which we need to avoid here.
// All directory-ish paths match "*/", except ".", "..", "*/.", and "*/..". // All directory-ish paths match "*/", except ".", "..", "*/.", and "*/..".
let looks_like_dir = match path.as_os_str().to_str() { let path_bytes = path.as_os_str().as_encoded_bytes();
// If it contains special character, prefer to err on the side of safety, i.e. forbidding the chown operation: let looks_like_dir = path_bytes == [b'.']
None => false, || path_bytes == [b'.', b'.']
Some(".") | Some("..") => true, || path_bytes.ends_with(&[MAIN_SEPARATOR as u8])
Some(path_str) => { || path_bytes.ends_with(&[MAIN_SEPARATOR as u8, b'.'])
(path_str.ends_with(MAIN_SEPARATOR_STR)) || path_bytes.ends_with(&[MAIN_SEPARATOR as u8, b'.', b'.']);
|| (path_str.ends_with(&format!("{MAIN_SEPARATOR_STR}.")))
|| (path_str.ends_with(&format!("{MAIN_SEPARATOR_STR}..")))
}
};
// TODO: Once we reach MSRV 1.74.0, replace this abomination by something simpler, e.g. this:
// let path_bytes = path.as_os_str().as_encoded_bytes();
// let looks_like_dir = path_bytes == [b'.']
// || path_bytes == [b'.', b'.']
// || path_bytes.ends_with(&[MAIN_SEPARATOR as u8])
// || path_bytes.ends_with(&[MAIN_SEPARATOR as u8, b'.'])
// || path_bytes.ends_with(&[MAIN_SEPARATOR as u8, b'.', b'.']);
if !looks_like_dir { if !looks_like_dir {
return false; return false;
} }