copy: prefer our hardlink to symlink emulation on OS X 10.10

* src/copy.c (CAN_HARDLINK_SYMLINKS): Don't enable use of linkat()
on Darwin 14, as the gnulib fallback emulation there doesn't
preserve ownership and timestamps etc.  This fixes a test failure
in tests/cp/link-symlink.sh
* tests/cp/link-deref.sh: Adjust accordingly.

diff --git a/src/copy.c b/src/copy.c
index 3af42957a23c2ebb773f69aaa614e9d55a57bdec..5fe69ea3cdbc2710d761d6d233e4a93176ca09cb 100644 (file)
--- a/src/copy.c
+++ b/src/copy.c
@@ -104,7 +104,7 @@ rpl_mkfifo (char const *file, mode_t mode)
 
 /* LINK_FOLLOWS_SYMLINKS is tri-state; if it is -1, we don't know
    how link() behaves, so assume we can't hardlink symlinks in that case.  */
-#if defined HAVE_LINKAT || ! LINK_FOLLOWS_SYMLINKS
+#if (defined HAVE_LINKAT && ! LINKAT_SYMLINK_NOTSUP) || ! LINK_FOLLOWS_SYMLINKS
 # define CAN_HARDLINK_SYMLINKS 1
 #else
 # define CAN_HARDLINK_SYMLINKS 0

diff --git a/tests/cp/link-deref.sh b/tests/cp/link-deref.sh
index 98d264408ec986a44526139a8d2cce7db057b37d..b0efb6f84f282e4e70a6626ceefd2046278a4e4d 100755 (executable)
--- a/tests/cp/link-deref.sh
+++ b/tests/cp/link-deref.sh
@@ -19,7 +19,8 @@
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ cp
 
-if grep '^#define HAVE_LINKAT 1' "$CONFIG_HEADER" > /dev/null \
+if { grep '^#define HAVE_LINKAT 1' "$CONFIG_HEADER" > /dev/null \
+     && grep '#undef LINKAT_SYMLINK_NOTSUP' "$CONFIG_HEADER" > /dev/null; } \
    || grep '^#define LINK_FOLLOWS_SYMLINKS 0' "$CONFIG_HEADER" > /dev/null; then
   # With this config cp will attempt to linkat() to hardlink a symlink.
   # So now double check the current file system supports this operation.