cp: keep handling the rest of the paths if one does not exists

Signed-off-by: Guillaume Ranquet <[email protected]>

Author: granquet

src/uu/cp/src/cp.rs

@@ -10,6 +10,7 @@ use std::collections::{HashMap, HashSet};
 use std::env;
 #[cfg(not(windows))]
 use std::ffi::CString;
+use std::ffi::OsString;
 use std::fs::{self, File, Metadata, OpenOptions, Permissions};
 use std::io;
 #[cfg(unix)]
@@ -692,7 +693,7 @@ pub fn uu_app() -> Command {
             Arg::new(options::PATHS)
                 .action(ArgAction::Append)
                 .value_hint(clap::ValueHint::AnyPath)
-                .value_parser(ValueParser::path_buf()),
+                .value_parser(clap::value_parser!(OsString)),
         )
 }
 
@@ -722,8 +723,11 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
         }
 
         let paths: Vec<PathBuf> = matches
-            .remove_many::<PathBuf>(options::PATHS)
-            .map(|v| v.collect())
+            .remove_many::<OsString>(options::PATHS)
+            .map(|v| {
+                v.map(|w| PathBuf::from(w))
+                    .collect()
+            })
             .unwrap_or_default();
 
         let (sources, target) = parse_path_args(paths, &options)?;
@@ -1134,7 +1138,24 @@ fn parse_path_args(
         }
     }
 
-    Ok((paths, target))
+    // If the path exists and is valid keep it in the argument list.
+    // Exception for symlinks as they are a bit more tricky to handle
+    // and there's logic further down the execution to handle them.
+    let (okpaths, invalidpaths): (Vec<_>, Vec<_>) = paths
+        .into_iter()
+        .partition(|p| p.is_symlink() || p.exists());
+
+    if !invalidpaths.is_empty() {
+        for p in invalidpaths.into_iter() {
+            eprintln!(
+                "cp: cannot stat '{}': No such file or directory",
+                p.display()
+            );
+        }
+        set_exit_code(EXIT_ERR);
+    }
+
+    Ok((okpaths, target))
 }
 
 /// When handling errors, we don't always want to show them to the user. This function handles that.

tests/by-util/test_cp.rs

@@ -2693,7 +2693,7 @@ fn test_cp_archive_on_nonexistent_file() {
         .arg(TEST_EXISTING_FILE)
         .fails()
         .stderr_only(
-            "cp: cannot stat 'nonexistent_file.txt': No such file or directory (os error 2)\n",
+            "cp: cannot stat 'nonexistent_file.txt': No such file or directory\n",
         );
 }