cp: Fix explicit preserve mode

Author: nikolalukovic

src/uu/cp/src/cp.rs

@@ -1692,8 +1692,9 @@ pub(crate) fn copy_attributes(
         fs::symlink_metadata(source).map_err(|e| CpError::IoErrContext(e, context.to_owned()))?;
 
     let is_preserve_required = matches!(options.attributes.mode, Preserve::Yes { required: true });
+    let is_explicit_true = matches!(options.attributes.mode, Preserve::No { explicit: true });
 
-    let mode = if !is_preserve_required && dest.is_dir() && is_dir_created {
+    let mode = if !is_preserve_required && !is_explicit_true && dest.is_dir() && is_dir_created {
         Preserve::Yes { required: false }
     } else {
         options.attributes.mode
@@ -1744,7 +1745,7 @@ pub(crate) fn copy_attributes(
         // permissions.
         if !dest.is_symlink() {
             let mut perms = source_metadata.permissions();
-            if is_dir_created && !is_preserve_required {
+            if is_dir_created && !is_preserve_required && !is_explicit_true {
                 let mode = handle_no_preserve_mode(options, perms.mode());
                 use uucore::mode::get_umask;
                 let mode = mode & !get_umask();

tests/by-util/test_cp.rs

@@ -7516,3 +7516,30 @@ fn test_cp_existing_perm_dir() {
 
     assert_eq!(mode, 0o40700);
 }
+
+#[test]
+#[cfg(not(target_os = "windows"))]
+fn test_cp_gnu_preserve_mode() {
+    use std::io;
+
+    let scene = TestScenario::new(util_name!());
+    let at = &scene.fixtures;
+
+    scene.cmd("mkdir").arg("d1").succeeds();
+    scene.cmd("mkdir").arg("d2").succeeds();
+    scene.cmd("chmod").arg("705").arg("d2").succeeds();
+
+    scene
+        .ucmd()
+        .arg("--no-preserve=mode")
+        .arg("-r")
+        .arg("d2")
+        .arg("d3")
+        .set_stdout(io::stdout())
+        .succeeds();
+
+    let d1_mode = get_mode(at.plus("d1"));
+    let d3_mode = get_mode(at.plus("d3"));
+
+    assert_eq!(d1_mode, d3_mode);
+}