github-mirror/mergerfs
2
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2025-06-07 03:14:38 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

rework policy code

Browse Source
This commit is contained in:
Antonio SJ Musumeci
2014-05-27 21:21:45 -04:00
parent 345d0bbdc4
commit aab90b0503
35 changed files with 983 additions and 991 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/access.cpp
View File

@ -45,19 +45,19 @@ using mergerfs::Policy;
static
int
_access(const Policy::Search::Func searchFunc,
const vector<string> &srcmounts,
const string fusepath,
const int mask)
_access(const fs::SearchFunc searchFunc,
const vector<string> &srcmounts,
const string fusepath,
const int mask)
{
int rv;
string path;
fs::PathVector path;
path = searchFunc(srcmounts,fusepath).full;
searchFunc(srcmounts,fusepath,path);
if(path.empty())
return -ENOENT;
rv = ::eaccess(path.c_str(),mask);
rv = ::eaccess(path[0].full.c_str(),mask);
return ((rv == -1) ? -errno : 0);
}
@ -74,9 +74,12 @@ namespace mergerfs
const config::Config &config = config::get();
if(fusepath == config.controlfile)
return 0;
return _access(*config.search,
config.srcmounts,
"/",
mask);
return _access(config.policy.search,
return _access(*config.search,
config.srcmounts,
fusepath,
mask);