github-mirror/mergerfs
2
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2025-01-20 01:52:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #856 from trapexit/dirname

Browse Source 
dirname should not return an empty string
This commit is contained in:
trapexit 2020-12-18 17:03:43 -05:00 committed by GitHub
commit 2e4c6c5fd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fs_acl.cpp
View File

@ -31,7 +31,7 @@ namespace fs
dir_has_defaults(const std::string &fullpath_) dir_has_defaults(const std::string &fullpath_)
{ {
int rv; int rv;
std::string dirpath; std::string dirpath;
dirpath = fs::path::dirname(fullpath_); dirpath = fs::path::dirname(fullpath_);

2
src/fs_clonepath.cpp
View File

@ -73,7 +73,7 @@ namespace fs
return 0; return 0;
dirname = fs::path::dirname(relative_); dirname = fs::path::dirname(relative_);
if(!dirname.empty()) if(dirname != "/")
{ {
rv = fs::clonepath(fromsrc_,tosrc_,dirname,return_metadata_errors_); rv = fs::clonepath(fromsrc_,tosrc_,dirname,return_metadata_errors_);
if(rv == -1) if(rv == -1)