diff options
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | src/copy.c | 2 | ||||
| -rw-r--r-- | tests/cp/Makefile.am | 1 | ||||
| -rwxr-xr-x | tests/cp/special-f | 42 |
4 files changed, 49 insertions, 1 deletions
@@ -6,6 +6,11 @@ GNU coreutils NEWS -*- outline -*- configure --enable-no-install-program=groups now works. + "cp -fR fifo E" now succeeds with an existing E. Before this fix, using + -fR to copy a fifo or "special" file onto an existing file would fail + with EEXIST. Now, it once again unlinks the destination before trying + to create the destination file. [bug introduced in coreutils-5.90] + dd once again works with unnecessary options like if=/dev/stdin and of=/dev/stdout. [bug introduced in fileutils-4.0h] diff --git a/src/copy.c b/src/copy.c index 4e38e0021..c2f21a340 100644 --- a/src/copy.c +++ b/src/copy.c @@ -1354,7 +1354,7 @@ copy_internal (char const *src_name, char const *dst_name, && (x->unlink_dest_before_opening || (x->preserve_links && 1 < dst_sb.st_nlink) || (x->dereference == DEREF_NEVER - && S_ISLNK (src_sb.st_mode)) + && ! S_ISREG (src_sb.st_mode)) )) { if (unlink (dst_name) != 0 && errno != ENOENT) diff --git a/tests/cp/Makefile.am b/tests/cp/Makefile.am index e2f96c9e3..28ebd35a6 100644 --- a/tests/cp/Makefile.am +++ b/tests/cp/Makefile.am @@ -16,6 +16,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. TESTS = \ + special-f \ parent-perm \ abuse \ proc-zero-len \ diff --git a/tests/cp/special-f b/tests/cp/special-f new file mode 100755 index 000000000..ebcbf8ea3 --- /dev/null +++ b/tests/cp/special-f @@ -0,0 +1,42 @@ +#!/bin/sh +# Ensure that "cp -Rf fifo E" unlinks E and retries. +# Up until coreutils-6.10.171, it would not. + +# Copyright (C) 2008 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/>. + +if test "$VERBOSE" = yes; then + set -x + cp --version +fi + +. $srcdir/../envvar-check +. $srcdir/../lang-default +. $srcdir/../test-lib.sh + +mkfifo fifo || + skip_test_ "fifos not supported" +touch e || framework-failure + +fail=0 + +# Without -f, expect it to fail. +cp -R fifo e || fail=1 + +# With -f, it must succeed. +cp -Rf fifo e || fail=1 +test -p fifo || fail=1 + +(exit $fail); exit $fail |