aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-12-04 17:24:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-06-04 17:05:41 +02:00
commit 88f5c244d3
1 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
code/nel/src/misc/path.cpp
View file

@ -2374,11 +2374,33 @@ static bool CopyMoveFile(const std::string &dest, const std::string &src, bool c
#else #else
if (rename (ssrc.c_str(), sdest.c_str()) == -1) if (rename (ssrc.c_str(), sdest.c_str()) == -1)
{ {
nlwarning ("PATH: CopyMoveFile error: can't rename '%s' into '%s', error %u", // unable to move because file systems are different
ssrc.c_str(), if (errno == EXDEV)
sdest.c_str(), {
errno); // different file system, we need to copy and delete file manually
return false; if (!CopyMoveFile(dest, src, true, failIfExists, progress)) return false;
// get modification time
uint32 modificationTime = CFile::getFileModificationDate(src);
// delete original file
if (!CFile::deleteFile(src)) return false;
// set same modification time
if (!CFile::setFileModificationDate(dest, modificationTime))
{
nlwarning("Unable to set modification time %s (%u) for %s", timestampToHumanReadable(modificationTime).c_str(), modificationTime, dest.c_str());
}
}
else
{
nlwarning("PATH: CopyMoveFile error: can't rename '%s' into '%s', error %u",
ssrc.c_str(),
sdest.c_str(),
errno);
return false;
}
} }
#endif #endif
} }