github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-25 09:39:52 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

builtins/path: Use fancy bitflags feature

Browse Source 
Just a cleanup TODO, no functional changes intended
This commit is contained in:
Fabian Boehm 2024-06-07 21:49:20 +02:00
parent ab0fdd1918
commit 2fa0f13db2
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/builtins/path.rs
View File

@ -86,7 +86,7 @@ impl TryFrom<&wstr> for TypeFlags {
}
bitflags! {
#[derive(Copy, Clone, Default)]
#[derive(Copy, Clone, Default, PartialEq)]
pub struct PermFlags: u32 {
const READ = 1 << 0;
const WRITE = 1 << 1;
@ -405,7 +405,6 @@ fn path_transform(
if transformed != arg {
n_transformed += 1;
// Return okay if path wasn't already in this form
// TODO: Is that correct?
if opts.quiet {
return STATUS_CMD_OK;
};
@ -798,26 +797,15 @@ fn filter_path(opts: &Options, path: &wstr, uid: Option<u32>, gid: Option<u32>)
if let Some(perm) = opts.perms {
let mut amode = 0;
// TODO: Update bitflags so this works
/*
for f in perm {
amode |= match f {
PermFlags::READ => R_OK,
PermFlags::WRITE => W_OK,
PermFlags::EXEC => X_OK,
_ => PermFlags::empty(),
_ => 0,
}
}
*/
if perm.contains(PermFlags::READ) {
amode |= R_OK;
}
if perm.contains(PermFlags::WRITE) {
amode |= W_OK;
}
if perm.contains(PermFlags::EXEC) {
amode |= X_OK;
}
// access returns 0 on success,
// -1 on failure. Yes, C can't even keep its bools straight.
// Skip this if we don't have a mode to check - the stat can do existence too.