asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #97719 from bruvzg/cross_dev_rename

Browse source 
[Linux/BSD] Fix cross-device rename.
This commit is contained in:
Rémi Verschelde 2024-10-04 11:21:58 +02:00
commit 6e03910578
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/unix/dir_access_unix.cpp
View file

@ -410,7 +410,17 @@ Error DirAccessUnix::rename(String p_path, String p_new_path) {
p_new_path = p_new_path.left(-1);
}
return ::rename(p_path.utf8().get_data(), p_new_path.utf8().get_data()) == 0 ? OK : FAILED;
int res = ::rename(p_path.utf8().get_data(), p_new_path.utf8().get_data());
if (res != 0 && errno == EXDEV) { // Cross-device move, use copy and remove.
Error err = OK;
err = copy(p_path, p_new_path);
if (err != OK) {
return err;
}
return remove(p_path);
} else {
return (res == 0) ? OK : FAILED;
}
}
Error DirAccessUnix::remove(String p_path) {