mirror of
https://github.com/trapexit/mergerfs.git
synced 2025-04-24 22:14:05 +08:00
fix rename'ing to local device
This commit is contained in:
parent
3b6c74878c
commit
ec38a9c783
10
src/fs.cpp
10
src/fs.cpp
@ -136,12 +136,12 @@ namespace fs
|
||||
|
||||
string
|
||||
make_path(const string base,
|
||||
const string fusepath)
|
||||
const string suffix)
|
||||
{
|
||||
if(*base.rbegin() == '/' ||
|
||||
*fusepath.rbegin() == '/')
|
||||
return base + fusepath;
|
||||
return base + '/' + fusepath;
|
||||
if(suffix[0] == '/' ||
|
||||
*base.rbegin() == '/')
|
||||
return base + suffix;
|
||||
return base + '/' + suffix;
|
||||
}
|
||||
|
||||
bool
|
||||
|
@ -57,6 +57,8 @@ _rename(const fs::SearchFunc searchFunc,
|
||||
pathto = fs::make_path(pathfrom[0].base,to);
|
||||
|
||||
rv = ::rename(pathfrom[0].full.c_str(),pathto.c_str());
|
||||
if(rv == -1 && errno == ENOENT)
|
||||
return -EXDEV;
|
||||
|
||||
return ((rv == -1) ? -errno : 0);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user