LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-19 09:17:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibFileSystem: Add FileSystem::move_file

Browse Source 
This is effectively a rename that falls back to a copy if the
destination is on a different mount point than the source.
This commit is contained in:
Shannon Booth 2023-07-06 20:49:14 +12:00 committed by Sam Atkins
parent 640d48255b
commit a5fd80a336
Notes: sideshowbarker 2024-07-17 18:13:59 +09:00 
Author: https://github.com/shannonbooth
Commit: https://github.com/SerenityOS/serenity/commit/a5fd80a336
Pull-request: https://github.com/SerenityOS/serenity/pull/19844
Reviewed-by: https://github.com/AtkinsSJ ✅
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Userland/Libraries/LibFileSystem/FileSystem.cpp
View File

@ -298,6 +298,24 @@ ErrorOr<void> copy_file_or_directory(StringView destination_path, StringView sou
return copy_file(final_destination_path, source_path, source_stat, *source, preserve_mode);
}
ErrorOr<void> move_file(StringView destination_path, StringView source_path, PreserveMode preserve_mode)
{
auto maybe_error = Core::System::rename(source_path, destination_path);
if (!maybe_error.is_error())
return {};
if (!maybe_error.error().is_errno() || maybe_error.error().code() != EXDEV)
return maybe_error;
auto source = TRY(Core::File::open(source_path, Core::File::OpenMode::Read));
auto source_stat = TRY(Core::System::fstat(source->fd()));
TRY(copy_file(destination_path, source_path, source_stat, *source, preserve_mode));
return Core::System::unlink(source_path);
}
ErrorOr<void> remove(StringView path, RecursionMode mode)
{
if (is_directory(path) && mode == RecursionMode::Allowed) {

1
Userland/Libraries/LibFileSystem/FileSystem.h
View File

@ -66,6 +66,7 @@ AK_ENUM_BITWISE_OPERATORS(PreserveMode);
ErrorOr<void> copy_file(StringView destination_path, StringView source_path, struct stat const& source_stat, Core::File& source, PreserveMode = PreserveMode::Nothing);
ErrorOr<void> copy_directory(StringView destination_path, StringView source_path, struct stat const& source_stat, LinkMode = LinkMode::Disallowed, PreserveMode = PreserveMode::Nothing);
ErrorOr<void> copy_file_or_directory(StringView destination_path, StringView source_path, RecursionMode = RecursionMode::Allowed, LinkMode = LinkMode::Disallowed, AddDuplicateFileMarker = AddDuplicateFileMarker::Yes, PreserveMode = PreserveMode::Nothing);
ErrorOr<void> move_file(StringView destination_path, StringView source_path, PreserveMode = PreserveMode::Nothing);
ErrorOr<void> remove(StringView path, RecursionMode);
ErrorOr<size_t> size(StringView path);
bool can_delete_or_move(StringView path);