RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

cp: adapt warning if source is used more than once

Browse source
This commit is contained in:
Daniel Hofstetter 2023-12-29 10:24:08 +01:00
parent 91080b152f
commit 7025619325
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/uu/cp/src/cp.rs
View file

@ -1193,7 +1193,7 @@ pub fn copy(sources: &[PathBuf], target: &Path, options: &Options) -> CopyResult
for source in sources { for source in sources {
if seen_sources.contains(source) { if seen_sources.contains(source) {
// FIXME: compare sources by the actual file they point to, not their path. (e.g. dir/file == dir/../dir/file in most cases) // FIXME: compare sources by the actual file they point to, not their path. (e.g. dir/file == dir/../dir/file in most cases)
show_warning!("source {} specified more than once", source.quote()); show_warning!("source file {} specified more than once", source.quote());
} else { } else {
let dest = construct_dest_path(source, target, target_type, options) let dest = construct_dest_path(source, target, target_type, options)
.unwrap_or_else(|_| target.to_path_buf()); .unwrap_or_else(|_| target.to_path_buf());

4
tests/by-util/test_cp.rs
View file

@ -111,7 +111,9 @@ fn test_cp_duplicate_files() {
.arg(TEST_HELLO_WORLD_SOURCE) .arg(TEST_HELLO_WORLD_SOURCE)
.arg(TEST_COPY_TO_FOLDER) .arg(TEST_COPY_TO_FOLDER)
.succeeds() .succeeds()
.stderr_contains("specified more than once"); .stderr_contains(format!(
"source file '{TEST_HELLO_WORLD_SOURCE}' specified more than once"
));
assert_eq!(at.read(TEST_COPY_TO_FOLDER_FILE), "Hello, World!\n"); assert_eq!(at.read(TEST_COPY_TO_FOLDER_FILE), "Hello, World!\n");
} }