From 86c8ff740b64f3724de20d71dca481bef30b18dd Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 2 Jan 2021 18:59:12 +0100 Subject: [PATCH 2/2] utimens: Fix test failure on macOS 10.13. * lib/utimens.c (fdutimens): Before calling utimensat, recognize a filename ending in a slash that does not point to a directory. --- ChangeLog | 6 ++++++ lib/utimens.c | 14 ++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/ChangeLog b/ChangeLog index 73d1139..5087bf4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2021-01-02 Bruno Haible + utimens: Fix test failure on macOS 10.13. + * lib/utimens.c (fdutimens): Before calling utimensat, recognize a + filename ending in a slash that does not point to a directory. + +2021-01-02 Bruno Haible + utimens: Avoid test failures on macOS 10.13. Reported by Martin Storsjö in . diff --git a/lib/utimens.c b/lib/utimens.c index 5bbae05..9f9c30a 100644 --- a/lib/utimens.c +++ b/lib/utimens.c @@ -246,6 +246,20 @@ fdutimens (int fd, char const *file, struct timespec const timespec[2]) # if HAVE_UTIMENSAT if (fd < 0) { +# if defined __APPLE__ && defined __MACH__ + size_t len = strlen (file); + if (len > 0 && file[len - 1] == '/') + { + struct stat statbuf; + if (stat (file, &statbuf) < 0) + return -1; + if (!S_ISDIR (statbuf.st_mode)) + { + errno = ENOTDIR; + return -1; + } + } +# endif result = utimensat (AT_FDCWD, file, ts, 0); # ifdef __linux__ /* Work around a kernel bug: -- 2.7.4