diff options
| author | Pádraig Brady <P@draigBrady.com> | 2016-01-12 12:39:43 +0000 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2016-01-13 11:16:37 +0000 |
| commit | d506af44befdbeabb027322652d4842314ba07be (patch) | |
| tree | df6d8c47e2d25c9d7d49503975fd1e017aa0836c /tests/cp | |
| parent | 2370c64a10924046d382f5205af3fcdaf0269959 (diff) | |
| download | coreutils-d506af44befdbeabb027322652d4842314ba07be.tar.xz | |
mv: fix data loss with repeated source dir and same destination
commit v8.23-31-g90aa291 failed to consider this case,
where the previous rename has failed, thus causing the
following to remove the specified directory:
mv dir dir dir
* src/copy.c (copy_internal): Assume this rename attempt has
succeeded, as a previous failure will already have been handled,
and we don't want to remove the source directory in this case.
* tests/cp/duplicate-sources.sh: Consolidate this test file to...
* tests/mv/dup-source.sh: ...here. Add test cases for same
source and dest.
* tests/local.mk: Remove the consolidated test.
* NEWS: Mention the bug fix.
Reported at https://bugzilla.redhat.com/1297464
Diffstat (limited to 'tests/cp')
| -rwxr-xr-x | tests/cp/duplicate-sources.sh | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/tests/cp/duplicate-sources.sh b/tests/cp/duplicate-sources.sh deleted file mode 100755 index c0170bb11..000000000 --- a/tests/cp/duplicate-sources.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# Ensure cp warns about but otherwise ignores source -# items specified multiple times. - -# Copyright (C) 2014-2016 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/>. - -. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src -print_ver_ cp - -mkdir a || framework_failure_ -touch f || framework_failure_ - -# 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 -cp: warning: source file 'f' specified more than once -EOF - -compare exp err || fail=1 - -Exit $fail |