cp: allow multiple usages of -R - Closes: uutils#5027

sylvestre · Jul 3, 2023 · 5025d67 · 5025d67
1 parent 42bf580
commit 5025d67
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/uu/cp/src/cp.rs b/src/uu/cp/src/cp.rs
@@ -432,7 +432,9 @@ pub fn uu_app() -> Command {
                 .long(options::RECURSIVE)
                 // --archive sets this option
                 .help("copy directories recursively")
-                .action(ArgAction::SetTrue),
+                .action(ArgAction::SetTrue)
+                // Allow several declarations
+                .overrides_with(options::RECURSIVE),
         )
         .arg(
             Arg::new(options::STRIP_TRAILING_SLASHES)

diff --git a/tests/by-util/test_cp.rs b/tests/by-util/test_cp.rs
@@ -158,6 +158,20 @@ fn test_cp_recurse() {
     assert_eq!(at.read(TEST_COPY_TO_FOLDER_NEW_FILE), "Hello, World!\n");
 }
 
+#[test]
+#[cfg(not(target_os = "macos"))]
+fn test_cp_recurse_several() {
+    let (at, mut ucmd) = at_and_ucmd!();
+    ucmd.arg("-r")
+        .arg("-r")
+        .arg(TEST_COPY_FROM_FOLDER)
+        .arg(TEST_COPY_TO_FOLDER_NEW)
+        .succeeds();
+
+    // Check the content of the destination file that was copied.
+    assert_eq!(at.read(TEST_COPY_TO_FOLDER_NEW_FILE), "Hello, World!\n");
+}
+
 #[test]
 fn test_cp_with_dirs_t() {
     let (at, mut ucmd) = at_and_ucmd!();