mirrors/rustic
2
0
Fork 0
mirror of https://github.com/rustic-rs/rustic.git synced 2025-10-26 11:18:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

restore: use correct file modes when restoring

Browse Source
This commit is contained in:
Alexander Weiss 2022-07-05 20:17:51 +02:00
parent 4dd22c9692
commit 07db2fec19
2 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/backend/ignore.rs
View File

@ -271,3 +271,38 @@ fn map_mode_to_go(mode: u32) -> u32 {
go_mode
}
/// map gloangs mode definition (https://pkg.go.dev/io/fs#ModeType) to t_mode from POSIX (inode(7))
/// This is the inverse function to map_mode_to_go()
pub fn map_mode_from_go(go_mode: u32) -> u32 {
let mut mode = go_mode & MODE_PERM;
if go_mode & GO_MODE_SOCKET > 0 {
mode |= S_IFSOCK
} else if go_mode & GO_MODE_SYMLINK > 0 {
mode |= S_IFLNK
} else if go_mode & GO_MODE_DEVICE > 0 && go_mode & GO_MODE_CHARDEV == 0 {
mode |= S_IFBLK;
} else if go_mode & GO_MODE_DIR > 0 {
mode |= S_IFDIR;
} else if go_mode & (GO_MODE_CHARDEV | GO_MODE_DEVICE) > 0 {
mode |= S_IFCHR;
} else if go_mode & GO_MODE_FIFO > 0 {
mode |= S_IFIFO;
} else if go_mode & GO_MODE_IRREG > 0 {
} else {
mode |= S_IFREG;
}
if go_mode & GO_MODE_SETUID > 0 {
mode |= S_ISUID;
}
if go_mode & GO_MODE_SETGID > 0 {
mode |= S_ISGID;
}
if go_mode & GO_MODE_STICKY > 0 {
mode |= S_ISVTX;
}
mode
}

7
src/backend/local.rs
View File

@ -10,7 +10,7 @@ use vlog::*;
use walkdir::WalkDir;
use super::node::{Metadata, Node, NodeType};
use super::{FileType, Id, ReadBackend, WriteBackend, ALL_FILE_TYPES};
use super::{map_mode_from_go, FileType, Id, ReadBackend, WriteBackend, ALL_FILE_TYPES};
#[derive(Clone)]
pub struct LocalBackend {
@ -193,11 +193,8 @@ impl LocalBackend {
// TODO: uid/gid and times
pub fn set_metadata(&self, item: impl AsRef<Path>, meta: &Metadata) {
let mode = *meta.mode();
if mode == 0 {
return;
}
let filename = self.path.join(item);
let mode = map_mode_from_go(*meta.mode());
std::fs::set_permissions(&filename, fs::Permissions::from_mode(mode))
.unwrap_or_else(|_| panic!("error chmod {:?}", filename));
}