diff --git a/Userland/Utilities/chown.cpp b/Userland/Utilities/chown.cpp index c0173d042e..a487a09e4c 100644 --- a/Userland/Utilities/chown.cpp +++ b/Userland/Utilities/chown.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -22,11 +23,15 @@ ErrorOr serenity_main(Main::Arguments arguments) String spec; Vector paths; - bool dont_follow_symlinks = false; + bool no_dereference = false; + bool recursive = false; + bool follow_symlinks = false; Core::ArgsParser args_parser; args_parser.set_general_help("Change the ownership of a file or directory."); - args_parser.add_option(dont_follow_symlinks, "Don't follow symlinks", "no-dereference", 'h'); + args_parser.add_option(no_dereference, "Don't follow symlinks", "no-dereference", 'h'); + args_parser.add_option(recursive, "Change file ownership recursively", "recursive", 'R'); + args_parser.add_option(follow_symlinks, "Follow symlinks while recursing into directories", nullptr, 'L'); args_parser.add_positional_argument(spec, "User and group IDs", "USER[:GROUP]"); args_parser.add_positional_argument(paths, "Paths to files", "PATH"); args_parser.parse(arguments); @@ -66,12 +71,30 @@ ErrorOr serenity_main(Main::Arguments arguments) } } - for (auto path : paths) { - if (dont_follow_symlinks) { + Function(StringView)> update_path_owner = [&](StringView path) -> ErrorOr { + auto stat = TRY(Core::System::lstat(path)); + + if (S_ISLNK(stat.st_mode) && !follow_symlinks && !paths.contains_slow(path)) + return {}; + + if (no_dereference) { TRY(Core::System::lchown(path, new_uid, new_gid)); } else { TRY(Core::System::chown(path, new_uid, new_gid)); } + + if (recursive && S_ISDIR(stat.st_mode)) { + Core::DirIterator it(path, Core::DirIterator::Flags::SkipParentAndBaseDir); + + while (it.has_next()) + TRY(update_path_owner(it.next_full_path())); + } + + return {}; + }; + + for (auto path : paths) { + TRY(update_path_owner(path)); } return 0;