RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 09:47:35 +00:00
Code Issues Activity Actions

cp: Use Core::File::copy_file_or_directory

Browse source
This commit is contained in:
Mițca Dumitru 2021-02-21 02:53:30 +02:00 • committed by Andreas Kling
parent 919492945e
commit 3f88fd81d1
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Userland/Utilities/cp.cpp
View file

@ -24,8 +24,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "cp.h"
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
@ -51,13 +51,21 @@ int main(int argc, char** argv)
args_parser.add_positional_argument(destination, "Destination file path", "destination"); args_parser.add_positional_argument(destination, "Destination file path", "destination");
args_parser.parse(argc, argv); args_parser.parse(argc, argv);
auto my_umask = umask(0);
umask(my_umask);
for (auto& source : sources) { for (auto& source : sources) {
bool ok = copy_file_or_directory(source, destination, recursion_allowed, link); auto result = Core::File::copy_file_or_directory(
if (!ok) destination, source,
recursion_allowed ? Core::File::RecursionMode::Allowed : Core::File::RecursionMode::Disallowed,
link ? Core::File::LinkMode::Allowed : Core::File::LinkMode::Disallowed,
Core::File::AddDuplicateFileMarker::No);
if (result.is_error()) {
if (result.error().tried_recursing)
warnln("cp: -R not specified; omitting directory '{}'", source);
else
warnln("cp: unable to copy '{}': {}", source, result.error().error_code);
return 1; return 1;
}
if (verbose) if (verbose)
printf("'%s' -> '%s'\n", source, destination); printf("'%s' -> '%s'\n", source, destination);
} }