github-mirror/rclone
2
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-25 17:57:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

vfs: factor out the VFS option initialization for re-use #3259

Browse Source
This commit is contained in:
Nick Craig-Wood 2022-06-16 11:11:14 +01:00
parent 6c832a72ee
commit 626a416ff8
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vfs/vfs.go
View File

@ -193,12 +193,8 @@ func New(f fs.Fs, opt *vfscommon.Options) *VFS {
vfs.Opt = vfscommon.DefaultOpt
}
// Mask the permissions with the umask
vfs.Opt.DirPerms &= ^os.FileMode(vfs.Opt.Umask)
vfs.Opt.FilePerms &= ^os.FileMode(vfs.Opt.Umask)
// Make sure directories are returned as directories
vfs.Opt.DirPerms |= os.ModeDir
// Fill out anything else
vfs.Opt.Init()
// Find a VFS with the same name and options and return it if possible
activeMu.Lock()

11
vfs/vfscommon/options.go
View File

@ -62,3 +62,14 @@ var DefaultOpt = Options{
ReadAhead: 0 * fs.Mebi,
UsedIsSize: false,
}
// Init the options, making sure everything is withing range
func (opt *Options) Init() {
// Mask the permissions with the umask
opt.DirPerms &= ^os.FileMode(opt.Umask)
opt.FilePerms &= ^os.FileMode(opt.Umask)
// Make sure directories are returned as directories
opt.DirPerms |= os.ModeDir
}