system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-22 02:26:11 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

mv: Prefer FileSystem over DeprecatedFile

Browse source
This commit is contained in:
Ben Wiederhake 2023-05-13 13:33:09 +02:00 committed by Jelle Raaijmakers
parent 02fa97a13f
commit 54b3f90e47
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Userland/Utilities/mv.cpp
View file

@ -7,7 +7,6 @@
#include <AK/DeprecatedString.h>
#include <AK/LexicalPath.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/DeprecatedFile.h>
#include <LibCore/System.h>
#include <LibFileSystem/FileSystem.h>
#include <LibMain/Main.h>
@ -76,14 +75,14 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
rc = rename(old_path.characters(), new_path.characters());
if (rc < 0) {
if (errno == EXDEV) {
auto result = Core::DeprecatedFile::copy_file_or_directory(
auto result = FileSystem::copy_file_or_directory(
new_path, old_path,
Core::DeprecatedFile::RecursionMode::Allowed,
Core::DeprecatedFile::LinkMode::Disallowed,
Core::DeprecatedFile::AddDuplicateFileMarker::No);
FileSystem::RecursionMode::Allowed,
FileSystem::LinkMode::Disallowed,
FileSystem::AddDuplicateFileMarker::No);
if (result.is_error()) {
warnln("mv: could not move '{}': {}", old_path, static_cast<Error const&>(result.error()));
warnln("mv: could not move '{}': {}", old_path, result.error());
return 1;
}
rc = unlink(old_path.characters());