From 756a928c8c4823bd0ed541ecbbc5b4ea7a2ccaa9 Mon Sep 17 00:00:00 2001 From: Pádraig Brady
Date: Thu, 18 Sep 2014 11:31:22 +0100
Subject: cp: fix handling of -H with multiply specified source dirs
Following on from commit v5.92-729-g130dd06, also avoid
the erroneous directory hardlink warning with -H.
* src/copy.c (copy_internal): Also handle the -H case
for command line arguments.
* tests/cp/duplicate-sources.sh: Augment the test case.
* NEWS: Augment the news entry.
---
tests/cp/duplicate-sources.sh | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
(limited to 'tests')
diff --git a/tests/cp/duplicate-sources.sh b/tests/cp/duplicate-sources.sh
index e15c6d213..35b2e460c 100755
--- a/tests/cp/duplicate-sources.sh
+++ b/tests/cp/duplicate-sources.sh
@@ -20,10 +20,19 @@
. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
print_ver_ cp
-mkdir a b || framework_failure_
+mkdir a || framework_failure_
touch f || framework_failure_
-cp -a a a f f b 2>err || fail=1
+# verify multiple files and dir sources only warned about
+mkdir dest || framework_failure_
+cp -a a a f f dest 2>err || fail=1
+rm -Rf dest || framework_failure_
+
+# verify multiple dirs and files with different names copied
+mkdir dest || framework_failure_
+ln -s a al || framework_failure_
+ln -s f fl || framework_failure_
+cp -aH a al f fl dest 2>>err || fail=1
cat <