From 75baf2abef1de395bcdece30f0e50e06b90f394e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mo=C3=AFse=20Valvassori?= Date: Fri, 21 Apr 2023 15:19:29 +0200 Subject: [PATCH] Show the message "ownership of 'foo' retained as 'bar'" for every path entry when `chown -v -R --from=` --- src/uucore/src/lib/features/perms.rs | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/uucore/src/lib/features/perms.rs b/src/uucore/src/lib/features/perms.rs index 68beb7fe62a..98496b86949 100644 --- a/src/uucore/src/lib/features/perms.rs +++ b/src/uucore/src/lib/features/perms.rs @@ -353,6 +353,27 @@ impl ChownExecutor { }; if !self.matched(meta.uid(), meta.gid()) { + if self.verbosity.level == VerbosityLevel::Verbose { + // Display a message when the current user/group doesn't match those specified in + // the `--from` args. + if self.dest_gid.is_none() { + let uid = meta.uid(); + println!( + "ownership of {} retained as {}", + path.quote(), + entries::uid2usr(uid).unwrap_or_else(|_| uid.to_string()), + ); + } else { + let uid = meta.uid(); + let gid = meta.gid(); + println!( + "ownership of {} retained as {}:{}", + path.quote(), + entries::uid2usr(uid).unwrap_or_else(|_| uid.to_string()), + entries::gid2grp(gid).unwrap_or_else(|_| gid.to_string()), + ); + } + } continue; }