diff options
| author | Pádraig Brady <P@draigBrady.com> | 2015-05-28 01:26:08 +0100 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2015-05-28 01:42:15 +0100 |
| commit | 67db18ce0ffc516eb0f39bf8ff3d8151ae810fc9 (patch) | |
| tree | 0cb3a3113e875fcc314ee331b4e4012627d21155 | |
| parent | a41172a5c4b23b34fba3d76c036afa0f2a7eeb28 (diff) | |
| download | coreutils-67db18ce0ffc516eb0f39bf8ff3d8151ae810fc9.tar.xz | |
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.
| -rw-r--r-- | src/copy.c | 2 | ||||
| -rwxr-xr-x | tests/cp/link-deref.sh | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/copy.c b/src/copy.c index 3af42957a..5fe69ea3c 100644 --- 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 98d264408..b0efb6f84 100755 --- 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. |