** Bug fixes
+ cp -a --link would not create a hardlink to a symlink, instead
+ copying the symlink and then not preserving its timestamp.
+ [bug introduced in coreutils-8.0]
+
cut could segfault when invoked with a user-specified output
delimiter and an unbounded range like "-f1234567890-".
[bug introduced in coreutils-5.3.0]
}
}
- /* cp, invoked with `--link --no-dereference', should not follow the
- link; we guarantee this with gnulib's linkat module (on systems
- where link(2) follows the link, gnulib creates a symlink with
- identical contents, which is good enough for our purposes). */
+ /* POSIX 2008 states that it is implementation-defined whether
+ link() on a symlink creates a hard-link to the symlink, or only
+ to the referent (effectively dereferencing the symlink) (POSIX
+ 2001 required the latter behavior, although many systems provided
+ the former). Yet cp, invoked with `--link --no-dereference',
+ should not follow the link. We can approximate the desired
+ behavior by skipping this hard-link creating block and instead
+ copying the symlink, via the `S_ISLNK'- copying code below.
+ LINK_FOLLOWS_SYMLINKS is tri-state; if it is -1, we don't know
+ how link() behaves, so we use the fallback case for safety.
+
+ Note gnulib's linkat module, guarantees that the symlink is not
+ dereferenced. However its emulation currently doesn't maintain
+ timestamps or ownership so we only call it when we know the
+ emulation will not be needed. */
else if (x->hard_link
- && (!S_ISLNK (src_mode)
- || x->dereference != DEREF_NEVER))
+ && !(LINK_FOLLOWS_SYMLINKS && S_ISLNK (src_mode)
+ && x->dereference == DEREF_NEVER))
{
if (linkat (AT_FDCWD, src_name, AT_FDCWD, dst_name, 0))
{
/* If we've just created a hard-link due to cp's --link option,
we're done. */
- if (x->hard_link && ! S_ISDIR (src_mode))
+ if (x->hard_link && ! S_ISDIR (src_mode)
+ && !(LINK_FOLLOWS_SYMLINKS && S_ISLNK (src_mode)
+ && x->dereference == DEREF_NEVER))
return delayed_ok;
if (copied_as_regular)
--- /dev/null
+#!/bin/sh
+# Ensure that cp -a --link maintains timestamps if possible
+
+# Copyright (C) 2011 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=.}/init.sh"; path_prepend_ ../src
+print_ver_ cp
+
+# Check that the timestamps of the symlink are copied
+# if we're using hardlink to symlink emulation.
+touch file
+ln -s file link || framework_failure
+touch -m -h -d 2011-01-01 link ||
+ skip_test_ "Your system doesn't support updating symlink timestamps"
+case `stat --format=%y link` in
+ 2011-01-01*) ;;
+ *) skip_test_ "Your system doesn't support updating symlink timestamps" ;;
+esac
+
+# link.cp is probably a hardlink, but may also be a symlink
+# In either case the timestamp should match the original.
+cp -al link link.cp
+case `stat --format=%y link.cp` in
+ 2011-01-01*) ;;
+ *) fail=1 ;;
+esac
+
+Exit $fail