projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
autoupdates
[gnulib.git]
/
m4
/
openat.m4
diff --git
a/m4/openat.m4
b/m4/openat.m4
index
b824393
..
80df704
100644
(file)
--- a/
m4/openat.m4
+++ b/
m4/openat.m4
@@
-1,7
+1,7
@@
-# serial 2
3
+# serial 2
9
# See if we need to use our replacement for Solaris' openat et al functions.
# See if we need to use our replacement for Solaris' openat et al functions.
-dnl Copyright (C) 2004-20
09
Free Software Foundation, Inc.
+dnl Copyright (C) 2004-20
10
Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@
-27,11
+27,19
@@
AC_DEFUN([gl_FUNC_OPENAT],
AC_CHECK_FUNCS_ONCE([lchmod])
AC_REPLACE_FUNCS([fchmodat fstatat mkdirat openat unlinkat])
AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
AC_CHECK_FUNCS_ONCE([lchmod])
AC_REPLACE_FUNCS([fchmodat fstatat mkdirat openat unlinkat])
AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
+ AC_REQUIRE([gl_FUNC_UNLINK])
case $ac_cv_func_openat+$ac_cv_func_lstat_dereferences_slashed_symlink in
case $ac_cv_func_openat+$ac_cv_func_lstat_dereferences_slashed_symlink in
- yes+yes) ;;
+ yes+yes)
+ # GNU/Hurd has unlinkat, but it has the same bug as unlink.
+ if test $REPLACE_UNLINK = 1; then
+ AC_LIBOBJ([unlinkat])
+ REPLACE_UNLINKAT=1
+ fi ;;
yes+*)
# Solaris 9 has *at functions, but uniformly mishandles trailing
# slash in all of them.
yes+*)
# Solaris 9 has *at functions, but uniformly mishandles trailing
# slash in all of them.
+ AC_LIBOBJ([openat])
+ REPLACE_OPENAT=1
AC_LIBOBJ([fstatat])
REPLACE_FSTATAT=1
AC_LIBOBJ([unlinkat])
AC_LIBOBJ([fstatat])
REPLACE_FSTATAT=1
AC_LIBOBJ([unlinkat])
@@
-66,7
+74,7
@@
AC_DEFUN([gl_FUNC_FCHOWNAT_DEREF_BUG],
ln -s conftest.no-such $gl_dangle
AC_RUN_IFELSE(
[AC_LANG_SOURCE(
ln -s conftest.no-such $gl_dangle
AC_RUN_IFELSE(
[AC_LANG_SOURCE(
- [[
+
[[
#include <fcntl.h>
#include <unistd.h>
#include <stdlib.h>
#include <fcntl.h>
#include <unistd.h>
#include <stdlib.h>
@@
-76,10
+84,10
@@
int
main ()
{
return (fchownat (AT_FDCWD, "$gl_dangle", -1, getgid (),
main ()
{
return (fchownat (AT_FDCWD, "$gl_dangle", -1, getgid (),
- AT_SYMLINK_NOFOLLOW) != 0
- && errno == ENOENT);
+
AT_SYMLINK_NOFOLLOW) != 0
+
&& errno == ENOENT);
}
}
- ]])],
+
]])],
[gl_cv_func_fchownat_nofollow_works=yes],
[gl_cv_func_fchownat_nofollow_works=no],
[gl_cv_func_fchownat_nofollow_works=no],
[gl_cv_func_fchownat_nofollow_works=yes],
[gl_cv_func_fchownat_nofollow_works=no],
[gl_cv_func_fchownat_nofollow_works=no],
@@
-94,8
+102,16
@@
main ()
# Also use the replacement function if fchownat is simply not available.
AC_DEFUN([gl_FUNC_FCHOWNAT],
[
# Also use the replacement function if fchownat is simply not available.
AC_DEFUN([gl_FUNC_FCHOWNAT],
[
+ AC_REQUIRE([gl_FUNC_CHOWN])
AC_CHECK_FUNC([fchownat],
AC_CHECK_FUNC([fchownat],
- [gl_FUNC_FCHOWNAT_DEREF_BUG([REPLACE_FCHOWNAT=1])],
+ [gl_FUNC_FCHOWNAT_DEREF_BUG([
+ REPLACE_FCHOWNAT=1
+ AC_DEFINE([FCHOWNAT_NOFOLLOW_BUG], [1],
+ [Define to 1 if your platform has fchownat, but it cannot
+ perform lchown tasks.])
+ if test $REPLACE_CHOWN = 1; then
+ REPLACE_FCHOWNAT=1
+ fi])],
[HAVE_FCHOWNAT=0])
if test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1; then
AC_LIBOBJ([fchownat])
[HAVE_FCHOWNAT=0])
if test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1; then
AC_LIBOBJ([fchownat])
@@
-104,6
+120,7
@@
AC_DEFUN([gl_FUNC_FCHOWNAT],
AC_DEFUN([gl_PREREQ_OPENAT],
[
AC_DEFUN([gl_PREREQ_OPENAT],
[
+ AC_REQUIRE([AC_C_INLINE])
AC_REQUIRE([gl_PROMOTED_TYPE_MODE_T])
:
])
AC_REQUIRE([gl_PROMOTED_TYPE_MODE_T])
:
])