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.
This commit is contained in:
Pádraig Brady committed 2014-09-19 11:25:23 +01:00
1 parent 90aa291c39
commit 756a928c8c
3 files changed
+17 -5

No files matched your search

+3 -2
View File
@@ -5,8 +5,9 @@ GNU coreutils NEWS -*- outline -*-
** Bug fixes
cp no longer issues an incorrect warning about directory hardlinks when a
source directory is specified multiple times. Instead a warning is issued
and the duplicate source directory is skipped, as already the case for files.
source directory is specified multiple times. Now, consistent with other
file types, a warning is issued for source directories with duplicate names,
or with -H the directory is copied again using the symlink name.
** New features
+3 -1
View File
@@ -2198,7 +2198,9 @@ copy_internal (char const *src_name, char const *dst_name,
There we just warn and return here. */
return true;
}
else if (x->dereference == DEREF_ALWAYS)
else if (x->dereference == DEREF_ALWAYS
|| (command_line_arg
&& x->dereference == DEREF_COMMAND_LINE_ARGUMENTS))
{
/* This happens when e.g., encountering a directory for the
second or subsequent time via symlinks when cp is invoked
+11 -2
View File
@@ -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 <<EOF >exp
cp: warning: source directory 'a' specified more than once