mirror of
https://github.com/trapexit/mergerfs.git
synced 2026-11-20 06:56:27 -05:00
Move everything to negative errno return types (#1499)
This commit is contained in:
parent
2b500f194a
commit
e8cd74cab0
177 changed files with 5952 additions and 5843 deletions
|
|
@ -38,156 +38,138 @@
|
|||
static const char SECURITY_CAPABILITY[] = "security.capability";
|
||||
|
||||
|
||||
namespace l
|
||||
static
|
||||
bool
|
||||
_is_attrname_security_capability(const char *attrname_)
|
||||
{
|
||||
static
|
||||
bool
|
||||
is_attrname_security_capability(const char *attrname_)
|
||||
{
|
||||
return (strcmp(attrname_,SECURITY_CAPABILITY) == 0);
|
||||
}
|
||||
|
||||
static
|
||||
int
|
||||
lgetxattr(const std::string &path_,
|
||||
const char *attrname_,
|
||||
void *value_,
|
||||
const size_t size_)
|
||||
{
|
||||
int rv;
|
||||
|
||||
rv = fs::lgetxattr(path_,attrname_,value_,size_);
|
||||
|
||||
return ((rv == -1) ? -errno : rv);
|
||||
}
|
||||
|
||||
static
|
||||
int
|
||||
getxattr_ctrl_file(Config::Read &cfg_,
|
||||
const char *attrname_,
|
||||
char *buf_,
|
||||
const size_t count_)
|
||||
{
|
||||
int rv;
|
||||
std::string key;
|
||||
std::string val;
|
||||
|
||||
if(!Config::is_mergerfs_xattr(attrname_))
|
||||
return -ENOATTR;
|
||||
|
||||
key = Config::prune_ctrl_xattr(attrname_);
|
||||
rv = cfg_->get(key,&val);
|
||||
if(rv < 0)
|
||||
return rv;
|
||||
|
||||
if(count_ == 0)
|
||||
return val.size();
|
||||
|
||||
if(count_ < val.size())
|
||||
return -ERANGE;
|
||||
|
||||
memcpy(buf_,val.c_str(),val.size());
|
||||
|
||||
return (int)val.size();
|
||||
}
|
||||
|
||||
static
|
||||
int
|
||||
getxattr_from_string(char *destbuf_,
|
||||
const size_t destbufsize_,
|
||||
const std::string &src_)
|
||||
{
|
||||
const size_t srcbufsize = src_.size();
|
||||
|
||||
if(destbufsize_ == 0)
|
||||
return srcbufsize;
|
||||
|
||||
if(srcbufsize > destbufsize_)
|
||||
return -ERANGE;
|
||||
|
||||
memcpy(destbuf_,src_.data(),srcbufsize);
|
||||
|
||||
return srcbufsize;
|
||||
}
|
||||
|
||||
static
|
||||
int
|
||||
getxattr_user_mergerfs_allpaths(const Branches::Ptr &branches_,
|
||||
const char *fusepath_,
|
||||
char *buf_,
|
||||
const size_t count_)
|
||||
{
|
||||
std::string concated;
|
||||
StrVec paths;
|
||||
StrVec branches;
|
||||
|
||||
branches_->to_paths(branches);
|
||||
|
||||
fs::findallfiles(branches,fusepath_,&paths);
|
||||
|
||||
concated = str::join(paths,'\0');
|
||||
|
||||
return l::getxattr_from_string(buf_,count_,concated);
|
||||
}
|
||||
|
||||
static
|
||||
int
|
||||
getxattr_user_mergerfs(const std::string &basepath_,
|
||||
const char *fusepath_,
|
||||
const std::string &fullpath_,
|
||||
const Branches &branches_,
|
||||
const char *attrname_,
|
||||
char *buf_,
|
||||
const size_t count_)
|
||||
{
|
||||
std::string key;
|
||||
|
||||
key = Config::prune_ctrl_xattr(attrname_);
|
||||
|
||||
if(key == "basepath")
|
||||
return l::getxattr_from_string(buf_,count_,basepath_);
|
||||
if(key == "relpath")
|
||||
return l::getxattr_from_string(buf_,count_,fusepath_);
|
||||
if(key == "fullpath")
|
||||
return l::getxattr_from_string(buf_,count_,fullpath_);
|
||||
if(key == "allpaths")
|
||||
return l::getxattr_user_mergerfs_allpaths(branches_,fusepath_,buf_,count_);
|
||||
|
||||
return -ENOATTR;
|
||||
}
|
||||
|
||||
static
|
||||
int
|
||||
getxattr(const Policy::Search &searchFunc_,
|
||||
const Branches &branches_,
|
||||
const char *fusepath_,
|
||||
const char *attrname_,
|
||||
char *buf_,
|
||||
const size_t count_)
|
||||
{
|
||||
int rv;
|
||||
std::string fullpath;
|
||||
std::vector<Branch*> branches;
|
||||
|
||||
rv = searchFunc_(branches_,fusepath_,branches);
|
||||
if(rv == -1)
|
||||
return -errno;
|
||||
|
||||
fullpath = fs::path::make(branches[0]->path,fusepath_);
|
||||
|
||||
if(Config::is_mergerfs_xattr(attrname_))
|
||||
return l::getxattr_user_mergerfs(branches[0]->path,
|
||||
fusepath_,
|
||||
fullpath,
|
||||
branches_,
|
||||
attrname_,
|
||||
buf_,
|
||||
count_);
|
||||
|
||||
return l::lgetxattr(fullpath,attrname_,buf_,count_);
|
||||
}
|
||||
return (strcmp(attrname_,SECURITY_CAPABILITY) == 0);
|
||||
}
|
||||
|
||||
static
|
||||
int
|
||||
_getxattr_ctrl_file(Config::Read &cfg_,
|
||||
const char *attrname_,
|
||||
char *buf_,
|
||||
const size_t count_)
|
||||
{
|
||||
int rv;
|
||||
std::string key;
|
||||
std::string val;
|
||||
|
||||
if(!Config::is_mergerfs_xattr(attrname_))
|
||||
return -ENOATTR;
|
||||
|
||||
key = Config::prune_ctrl_xattr(attrname_);
|
||||
rv = cfg_->get(key,&val);
|
||||
if(rv < 0)
|
||||
return rv;
|
||||
|
||||
if(count_ == 0)
|
||||
return val.size();
|
||||
|
||||
if(count_ < val.size())
|
||||
return -ERANGE;
|
||||
|
||||
memcpy(buf_,val.c_str(),val.size());
|
||||
|
||||
return (int)val.size();
|
||||
}
|
||||
|
||||
static
|
||||
int
|
||||
_getxattr_from_string(char *destbuf_,
|
||||
const size_t destbufsize_,
|
||||
const std::string &src_)
|
||||
{
|
||||
const size_t srcbufsize = src_.size();
|
||||
|
||||
if(destbufsize_ == 0)
|
||||
return srcbufsize;
|
||||
|
||||
if(srcbufsize > destbufsize_)
|
||||
return -ERANGE;
|
||||
|
||||
memcpy(destbuf_,src_.data(),srcbufsize);
|
||||
|
||||
return srcbufsize;
|
||||
}
|
||||
|
||||
static
|
||||
int
|
||||
_getxattr_user_mergerfs_allpaths(const Branches::Ptr &branches_,
|
||||
const char *fusepath_,
|
||||
char *buf_,
|
||||
const size_t count_)
|
||||
{
|
||||
std::string concated;
|
||||
StrVec paths;
|
||||
StrVec branches;
|
||||
|
||||
branches_->to_paths(branches);
|
||||
|
||||
fs::findallfiles(branches,fusepath_,&paths);
|
||||
|
||||
concated = str::join(paths,'\0');
|
||||
|
||||
return ::_getxattr_from_string(buf_,count_,concated);
|
||||
}
|
||||
|
||||
static
|
||||
int
|
||||
_getxattr_user_mergerfs(const std::string &basepath_,
|
||||
const char *fusepath_,
|
||||
const std::string &fullpath_,
|
||||
const Branches &branches_,
|
||||
const char *attrname_,
|
||||
char *buf_,
|
||||
const size_t count_)
|
||||
{
|
||||
std::string key;
|
||||
|
||||
key = Config::prune_ctrl_xattr(attrname_);
|
||||
|
||||
if(key == "basepath")
|
||||
return ::_getxattr_from_string(buf_,count_,basepath_);
|
||||
if(key == "relpath")
|
||||
return ::_getxattr_from_string(buf_,count_,fusepath_);
|
||||
if(key == "fullpath")
|
||||
return ::_getxattr_from_string(buf_,count_,fullpath_);
|
||||
if(key == "allpaths")
|
||||
return ::_getxattr_user_mergerfs_allpaths(branches_,fusepath_,buf_,count_);
|
||||
|
||||
return -ENOATTR;
|
||||
}
|
||||
|
||||
static
|
||||
int
|
||||
_getxattr(const Policy::Search &searchFunc_,
|
||||
const Branches &branches_,
|
||||
const char *fusepath_,
|
||||
const char *attrname_,
|
||||
char *buf_,
|
||||
const size_t count_)
|
||||
{
|
||||
int rv;
|
||||
std::string fullpath;
|
||||
std::vector<Branch*> branches;
|
||||
|
||||
rv = searchFunc_(branches_,fusepath_,branches);
|
||||
if(rv < 0)
|
||||
return rv;
|
||||
|
||||
fullpath = fs::path::make(branches[0]->path,fusepath_);
|
||||
|
||||
if(Config::is_mergerfs_xattr(attrname_))
|
||||
return ::_getxattr_user_mergerfs(branches[0]->path,
|
||||
fusepath_,
|
||||
fullpath,
|
||||
branches_,
|
||||
attrname_,
|
||||
buf_,
|
||||
count_);
|
||||
|
||||
return fs::lgetxattr(fullpath,attrname_,buf_,count_);
|
||||
}
|
||||
|
||||
int
|
||||
FUSE::getxattr(const char *fusepath_,
|
||||
|
|
@ -198,13 +180,13 @@ FUSE::getxattr(const char *fusepath_,
|
|||
Config::Read cfg;
|
||||
|
||||
if(Config::is_ctrl_file(fusepath_))
|
||||
return l::getxattr_ctrl_file(cfg,
|
||||
return ::_getxattr_ctrl_file(cfg,
|
||||
attrname_,
|
||||
attrvalue_,
|
||||
attrvalue_size_);
|
||||
|
||||
if((cfg->security_capability == false) &&
|
||||
l::is_attrname_security_capability(attrname_))
|
||||
::_is_attrname_security_capability(attrname_))
|
||||
return -ENOATTR;
|
||||
|
||||
if(cfg->xattr.to_int())
|
||||
|
|
@ -213,7 +195,7 @@ FUSE::getxattr(const char *fusepath_,
|
|||
const fuse_context *fc = fuse_get_context();
|
||||
const ugid::Set ugid(fc->uid,fc->gid);
|
||||
|
||||
return l::getxattr(cfg->func.getxattr.policy,
|
||||
return ::_getxattr(cfg->func.getxattr.policy,
|
||||
cfg->branches,
|
||||
fusepath_,
|
||||
attrname_,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue