eliott/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2026-04-25 17:15:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

mv: Prefer FileSystem::remove over unlink when moving across filesystems

Browse Source 
unlink doesn't handle directories, while FileSystem::remove does.
This commit is contained in:
implicitfield
2024-12-09 23:38:17 +02:00
committed by Nico Weber
parent 4148716671
commit 14d216e819
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Userland/Utilities/mv.cpp
View File

@@ -75,19 +75,18 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
rc = rename(old_path.characters(), new_path.characters());
if (rc < 0) {
if (errno == EXDEV) {
auto result = FileSystem::copy_file_or_directory(
new_path, old_path,
FileSystem::RecursionMode::Allowed,
FileSystem::LinkMode::Disallowed,
FileSystem::AddDuplicateFileMarker::No);
if (result.is_error()) {
if (auto result = FileSystem::copy_file_or_directory(
new_path, old_path,
FileSystem::RecursionMode::Allowed,
FileSystem::LinkMode::Disallowed,
FileSystem::AddDuplicateFileMarker::No);
result.is_error()) {
warnln("mv: could not move '{}': {}", old_path, result.error());
return 1;
}
rc = unlink(old_path.characters());
if (rc < 0)
warnln("mv: unlink '{}': {}", old_path, strerror(errno));
if (auto result = FileSystem::remove(old_path.view(), FileSystem::RecursionMode::Allowed); result.is_error())
warnln("mv: could not remove '{}': {}", old_path, result.error());
} else {
warnln("mv: cannot move '{}' : {}", old_path, strerror(errno));
}