mirror of
git://git.sv.gnu.org/coreutils.git
synced 2026-08-07 09:11:11 +02:00
Jim Meyering
b50a4ae557
Running "mkdir dir; cp -rl dir dir" would create dir/dir/dir/...
rather than diagnosing the "copy-into-self" failure.
The easy fix would have been to revert this part of the change
[3ece0355 2008-11-09 cp: use far less memory in some cases]
that introduced the bug:
- remember_copied (dst_name, dst_sb.st_ino, dst_sb.st_dev);
+ if (!x->hard_link)
+ remember_copied (dst_name, dst_sb.st_ino, dst_sb.st_dev);
However, that would have induced the failure of the new cp/link-heap
test, due to the added memory pressure of recording 10k dev/ino pairs.
And besides, I liked that improvement and wanted to keep it.
Now that it's obvious recording the just-created-directory dev/ino
needn't depend on the setting of hard_link, I realized it is necessary
to record the pair only for the first directory created for each
source command-line argument.
I made that change, then noticed the new test, cp -rl a d d, would pass
when run once, yet output the into-self diagnostic twice. Also note
the side effect: it creates d/a and d/d. However, running that same
command a second time, now with the modified directory, would fail.
That turned out to be due to the fact that although the first into-self
failure was detected in copy_dir, that function would continue copying
other entries regardless -- and that would make it fail (eventually)
with the unwanted recursion.
* src/copy.c (copy_internal): This function needed an indicator of
whether, for a give command line argument, it had already created its
first directory. If so, no more need to record dev/ino pairs. If this
is the first, then do record its pair. Hence, the new parameter.
(copy_dir, copy): Update callers.
(copy_dir): Upon any into-self failure, break out of the loop.
* tests/cp/into-self: Test for the above.
Reported by Mikael Magnusson.
63 lines
1.7 KiB
Bash
Executable File
63 lines
1.7 KiB
Bash
Executable File
#!/bin/sh
|
|
# Confirm that copying a directory into itself gets a proper diagnostic.
|
|
|
|
# Copyright (C) 2001, 2002, 2004, 2006-2009 Free Software Foundation, Inc.
|
|
|
|
# This program is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
# In 4.0.35 and earlier, `mkdir dir && cp -R dir dir' would produce this:
|
|
# cp: won't create hard link `dir/dir/dir' to directory `'
|
|
# Now it gives this:
|
|
# cp: can't copy a directory `dir' into itself `dir/dir'
|
|
|
|
if test "$VERBOSE" = yes; then
|
|
set -x
|
|
cp --version
|
|
fi
|
|
|
|
. $srcdir/test-lib.sh
|
|
|
|
mkdir a dir || framework_failure
|
|
|
|
fail=0
|
|
|
|
# This command should exit nonzero.
|
|
cp -R dir dir 2> out && fail=1
|
|
echo 1 >> out
|
|
|
|
# This should, too. However, with coreutils-7.1 it would infloop.
|
|
cp -rl dir dir 2>> out && fail=1
|
|
echo 2 >> out
|
|
|
|
cp -rl a dir dir 2>> out && fail=1
|
|
echo 3 >> out
|
|
cp -rl a dir dir 2>> out && fail=1
|
|
echo 4 >> out
|
|
|
|
cat > exp <<\EOF
|
|
cp: cannot copy a directory, `dir', into itself, `dir/dir'
|
|
1
|
|
cp: cannot copy a directory, `dir', into itself, `dir/dir'
|
|
2
|
|
cp: cannot copy a directory, `dir', into itself, `dir/dir'
|
|
3
|
|
cp: cannot copy a directory, `dir', into itself, `dir/dir'
|
|
4
|
|
EOF
|
|
#'
|
|
|
|
compare out exp || fail=1
|
|
|
|
Exit $fail
|