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

Utilities: Implement -p flag for cp

Browse source
This commit is contained in:
Jean-Baptiste Boric 2021-08-15 12:24:37 +02:00 • committed by Andreas Kling
parent 8cc8d72619
commit 58cebf1b6f
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Userland/Utilities/cp.cpp
View file

@ -12,12 +12,13 @@
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
if (pledge("stdio rpath wpath cpath fattr", nullptr) < 0) { if (pledge("stdio rpath wpath cpath fattr chown", nullptr) < 0) {
perror("pledge"); perror("pledge");
return 1; return 1;
} }
bool link = false; bool link = false;
bool preserve = false;
bool recursion_allowed = false; bool recursion_allowed = false;
bool verbose = false; bool verbose = false;
Vector<String> sources; Vector<String> sources;
@ -25,6 +26,7 @@ int main(int argc, char** argv)
Core::ArgsParser args_parser; Core::ArgsParser args_parser;
args_parser.add_option(link, "Link files instead of copying", "link", 'l'); args_parser.add_option(link, "Link files instead of copying", "link", 'l');
args_parser.add_option(preserve, "Preserve time, UID/GID and file permissions", nullptr, 'p');
args_parser.add_option(recursion_allowed, "Copy directories recursively", "recursive", 'R'); args_parser.add_option(recursion_allowed, "Copy directories recursively", "recursive", 'R');
args_parser.add_option(recursion_allowed, "Same as -R", nullptr, 'r'); args_parser.add_option(recursion_allowed, "Same as -R", nullptr, 'r');
args_parser.add_option(verbose, "Verbose", "verbose", 'v'); args_parser.add_option(verbose, "Verbose", "verbose", 'v');
@ -32,6 +34,15 @@ 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);
if (preserve) {
umask(0);
} else {
if (pledge("stdio rpath wpath cpath fattr", nullptr) < 0) {
perror("pledge");
return 1;
}
}
bool destination_is_existing_dir = Core::File::is_directory(destination); bool destination_is_existing_dir = Core::File::is_directory(destination);
for (auto& source : sources) { for (auto& source : sources) {
@ -43,7 +54,8 @@ int main(int argc, char** argv)
destination_path, source, destination_path, source,
recursion_allowed ? Core::File::RecursionMode::Allowed : Core::File::RecursionMode::Disallowed, recursion_allowed ? Core::File::RecursionMode::Allowed : Core::File::RecursionMode::Disallowed,
link ? Core::File::LinkMode::Allowed : Core::File::LinkMode::Disallowed, link ? Core::File::LinkMode::Allowed : Core::File::LinkMode::Disallowed,
Core::File::AddDuplicateFileMarker::No); Core::File::AddDuplicateFileMarker::No,
preserve ? Core::File::PreserveMode::PermissionsOwnershipTimestamps : Core::File::PreserveMode::Nothing);
if (result.is_error()) { if (result.is_error()) {
if (result.error().tried_recursing) if (result.error().tried_recursing)