From 71befb4f6c4023b397fabca604ad339eed4791de Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 12 Nov 2017 13:16:15 +0100 Subject: [PATCH] faccessat: Make the last change more robust. * m4/faccessat.m4 (gl_FUNC_FACCESSAT): Require gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK. Treat "guessing yes" like "yes". --- ChangeLog | 6 ++++++ m4/faccessat.m4 | 10 +++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 651a9eb007..15ceb2dac5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-11-12 Bruno Haible + + faccessat: Make the last change more robust. + * m4/faccessat.m4 (gl_FUNC_FACCESSAT): Require + gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK. Treat "guessing yes" like "yes". + 2017-11-11 Paul Eggert faccessat: port to macOS (Bug#29231) diff --git a/m4/faccessat.m4 b/m4/faccessat.m4 index f4cb49d166..c64545abd4 100644 --- a/m4/faccessat.m4 +++ b/m4/faccessat.m4 @@ -1,4 +1,4 @@ -# serial 7 +# serial 8 # See if we need to provide faccessat replacement. dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. @@ -11,6 +11,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_FACCESSAT], [ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) + AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK]) dnl Persuade glibc to declare faccessat(). AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) @@ -18,8 +19,11 @@ AC_DEFUN([gl_FUNC_FACCESSAT], AC_CHECK_FUNCS_ONCE([faccessat]) if test $ac_cv_func_faccessat = no; then HAVE_FACCESSAT=0 - elif test "$gl_cv_func_lstat_dereferences_slashed_symlink" != yes; then - REPLACE_FACCESSAT=1 + else + case "$gl_cv_func_lstat_dereferences_slashed_symlink" in + *yes) ;; + *) REPLACE_FACCESSAT=1 ;; + esac fi ]) -- 2.39.5