factorize duplicate code in a function

uutils · May 22, 2023 · aabf5de · aabf5de
1 parent 349df47
commit aabf5de
Showing 1 changed file with 32 additions and 42 deletions.
diff --git a/src/uucore/src/lib/features/perms.rs b/src/uucore/src/lib/features/perms.rs
@@ -271,27 +271,11 @@ impl ChownExecutor {
  }
  }
  } else {
- 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()),
- );
- }
- }
+ self.print_verbose_ownership_retained_as(
+ path,
+ meta.uid(),
+ self.dest_gid.map(|_| meta.gid()),
+ );
  0
  };
 
@@ -353,27 +337,11 @@ 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()),
- );
- }
- }
+ self.print_verbose_ownership_retained_as(
+ path,
+ meta.uid(),
+ self.dest_gid.map(|_| meta.gid()),
+ );
  continue;
  }
 
@@ -435,6 +403,28 @@ impl ChownExecutor {
  IfFrom::UserGroup(u, g) => u == uid && g == gid,
  }
  }
+
+ fn print_verbose_ownership_retained_as(&self, path: &Path, uid: u32, gid: Option<u32>) {
+ if self.verbosity.level == VerbosityLevel::Verbose {
+ match gid {
+ Some(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()),
+ );
+ }
+ None => {
+ println!(
+ "ownership of {} retained as {}",
+ path.quote(),
+ entries::uid2usr(uid).unwrap_or_else(|_| uid.to_string()),
+ );
+ }
+ }
+ }
+ }
 }
 
 pub mod options {