RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 09:24:57 +00:00
Code Issues Activity Actions

mv: Use Core::File::copy_file_or_directory

Browse source
This commit is contained in:
Mițca Dumitru 2021-02-21 02:54:37 +02:00 • committed by Andreas Kling
parent 3f88fd81d1
commit edb543657a
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/Utilities/mv.cpp
View file

@ -24,14 +24,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "cp.h"
#include <AK/LexicalPath.h>
#include <AK/String.h>
#include <LibCore/ArgsParser.h>
#include <errno.h>
#include <LibCore/File.h>
#include <stdio.h>
#include <sys/stat.h>
#include <unistd.h>
int main(int argc, char** argv)
{
@ -88,11 +86,11 @@ int main(int argc, char** argv)
rc = rename(old_path, new_path);
if (rc < 0) {
if (errno == EXDEV) {
bool recursion_allowed = true;
bool link = false;
bool ok = copy_file_or_directory(old_path, new_path, recursion_allowed, link);
if (!ok)
auto result = Core::File::copy_file_or_directory(new_path, old_path, Core::File::RecursionMode::Allowed, Core::File::LinkMode::Disallowed, Core::File::AddDuplicateFileMarker::No);
if (result.is_error()) {
warnln("mv: could not move '{}': {}", old_path, result.error().error_code);
return 1;
}
rc = unlink(old_path);
if (rc < 0)
fprintf(stderr, "mv: unlink '%s': %s\n", old_path, strerror(errno));