github-mirror/mergerfs
2
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2025-06-22 21:51:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix rename'ing to local device

Browse Source
This commit is contained in:
Antonio SJ Musumeci
2014-06-24 16:13:49 -04:00
parent 3b6c74878c
commit ec38a9c783
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/fs.cpp
View File

@ -136,12 +136,12 @@ namespace fs
string string
make_path(const string base, make_path(const string base,
const string fusepath) const string suffix)
{ {
if(*base.rbegin() == '/' || if(suffix[0] == '/' ||
*fusepath.rbegin() == '/') *base.rbegin() == '/')
return base + fusepath; return base + suffix;
return base + '/' + fusepath; return base + '/' + suffix;
} }
bool bool

2
src/rename.cpp
View File

@ -57,6 +57,8 @@ _rename(const fs::SearchFunc searchFunc,
pathto = fs::make_path(pathfrom[0].base,to); pathto = fs::make_path(pathfrom[0].base,to);
rv = ::rename(pathfrom[0].full.c_str(),pathto.c_str()); rv = ::rename(pathfrom[0].full.c_str(),pathto.c_str());
if(rv == -1 && errno == ENOENT)
return -EXDEV;
return ((rv == -1) ? -errno : 0); return ((rv == -1) ? -errno : 0);
} }