From dd1890b79725d4a044039b476e6ad4592d2c9399 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 11 Nov 2017 22:33:38 -0800
Subject: faccessat: port to macOS (Bug#29231)

macOS faccessat has the same bug that lstat does: if the file
name ends in '/' it ignores the trailing slash.
Problem reported for Emacs by Vincent Zhang.
* doc/posix-functions/faccessat.texi (faccessat): Document this.
* lib/faccessat.c (_GL_INCLUDING_UNISTD_H): Define and undef
around the initial includes.  Include errno.h, string.h, sys/stat.h.
(orig_faccessat) [HAVE_FACCESSAT]: New function.
Include "unistd.h" after defining it.
(rpl_faccessat) [HAVE_FACCESSAT]: New implementation.
* lib/unistd.in.h (faccessat) [REPLACE_FACCESSAT]:
Handle in the usual way.
* m4/faccessat.m4 (gl_FUNC_FACCESSAT): Replace faccessat if
lstat dereferences symlinks, since faccessat is likely to
have the same problem.
* m4/unistd_h.m4 (gl_UNISTD_H_DEFAULTS): Default REPLACE_ACCESSAT.
* modules/faccessat (Depends-on): Add fstatat.
Depend if REPLACE_FACCESSAT is 1, too.
(configure.ac): Link if REPLACE_FACCESSAT is 1.
* modules/faccessat-tests (Depends-on): Add symlink.
* modules/unistd (unistd.h): Substitute REPLACE_FACCESSAT.
* tests/test-faccessat.c (main): Test for the bug.
---
 modules/faccessat | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'modules/faccessat')

diff --git a/modules/faccessat b/modules/faccessat
index ee4f2a5a9a..d13d167e1f 100644
--- a/modules/faccessat
+++ b/modules/faccessat
@@ -9,19 +9,20 @@ m4/faccessat.m4
 Depends-on:
 unistd
 extensions
-at-internal     [test $HAVE_FACCESSAT = 0]
-dosname         [test $HAVE_FACCESSAT = 0]
-errno           [test $HAVE_FACCESSAT = 0]
-fchdir          [test $HAVE_FACCESSAT = 0]
-fcntl-h         [test $HAVE_FACCESSAT = 0]
-openat-die      [test $HAVE_FACCESSAT = 0]
-openat-h        [test $HAVE_FACCESSAT = 0]
-save-cwd        [test $HAVE_FACCESSAT = 0]
-euidaccess      [test $HAVE_FACCESSAT = 0]
+at-internal     [test $HAVE_FACCESSAT = 0 || test $REPLACE_FACCESSAT = 1]
+dosname         [test $HAVE_FACCESSAT = 0 || test $REPLACE_FACCESSAT = 1]
+errno           [test $HAVE_FACCESSAT = 0 || test $REPLACE_FACCESSAT = 1]
+fchdir          [test $HAVE_FACCESSAT = 0 || test $REPLACE_FACCESSAT = 1]
+fcntl-h         [test $HAVE_FACCESSAT = 0 || test $REPLACE_FACCESSAT = 1]
+fstatat         [test $HAVE_FACCESSAT = 0 || test $REPLACE_FACCESSAT = 1]
+openat-die      [test $HAVE_FACCESSAT = 0 || test $REPLACE_FACCESSAT = 1]
+openat-h        [test $HAVE_FACCESSAT = 0 || test $REPLACE_FACCESSAT = 1]
+save-cwd        [test $HAVE_FACCESSAT = 0 || test $REPLACE_FACCESSAT = 1]
+euidaccess      [test $HAVE_FACCESSAT = 0 || test $REPLACE_FACCESSAT = 1]
 
 configure.ac:
 gl_FUNC_FACCESSAT
-if test $HAVE_FACCESSAT = 0; then
+if test $HAVE_FACCESSAT = 0 || test $REPLACE_FACCESSAT = 1; then
   AC_LIBOBJ([faccessat])
   gl_PREREQ_FACCESSAT
 fi
-- 
cgit v1.2.1