projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test-fopen-safer: split from test-fopen
[gnulib.git]
/
m4
/
openat.m4
diff --git
a/m4/openat.m4
b/m4/openat.m4
index
88efc75
..
daa6a53
100644
(file)
--- a/
m4/openat.m4
+++ b/
m4/openat.m4
@@
-1,7
+1,7
@@
-#
serial 13
+#
serial 18
# 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
, 2005, 2006
Free Software Foundation, Inc.
+dnl Copyright (C) 2004
-2009
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.
@@
-10,12
+10,12
@@
dnl with or without modifications, as long as this notice is preserved.
AC_DEFUN([gl_FUNC_OPENAT],
[
AC_DEFUN([gl_FUNC_OPENAT],
[
- AC_LIBOBJ([openat-die])
AC_LIBOBJ([openat-proc])
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
AC_CHECK_FUNCS_ONCE([lchmod])
AC_CHECK_FUNCS_ONCE([fdopendir])
AC_REPLACE_FUNCS([fchmodat mkdirat openat])
AC_LIBOBJ([openat-proc])
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
AC_CHECK_FUNCS_ONCE([lchmod])
AC_CHECK_FUNCS_ONCE([fdopendir])
AC_REPLACE_FUNCS([fchmodat mkdirat openat])
+ AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
case $ac_cv_func_openat+$ac_cv_func_lstat_dereferences_slashed_symlink in
yes+yes) ;;
yes+*) AC_LIBOBJ([fstatat]);;
case $ac_cv_func_openat+$ac_cv_func_lstat_dereferences_slashed_symlink in
yes+yes) ;;
yes+*) AC_LIBOBJ([fstatat]);;
@@
-24,7
+24,7
@@
AC_DEFUN([gl_FUNC_OPENAT],
[Define to rpl_ if the openat replacement function should be used.])
gl_PREREQ_OPENAT;;
esac
[Define to rpl_ if the openat replacement function should be used.])
gl_PREREQ_OPENAT;;
esac
- AC_REQUIRE([gl_FUNC_FCHOWNAT])
+ gl_FUNC_FCHOWNAT
])
# gl_FUNC_FCHOWNAT_DEREF_BUG([ACTION-IF-BUGGY[, ACTION-IF-NOT_BUGGY]])
])
# gl_FUNC_FCHOWNAT_DEREF_BUG([ACTION-IF-BUGGY[, ACTION-IF-NOT_BUGGY]])
@@
-38,6
+38,7
@@
AC_DEFUN([gl_FUNC_FCHOWNAT_DEREF_BUG],
rm -f $gl_dangle
# Arrange for deletion of the temporary file this test creates.
ac_clean_files="$ac_clean_files $gl_dangle"
rm -f $gl_dangle
# Arrange for deletion of the temporary file this test creates.
ac_clean_files="$ac_clean_files $gl_dangle"
+ ln -s conftest.no-such $gl_dangle
AC_RUN_IFELSE(
[AC_LANG_SOURCE(
[[
AC_RUN_IFELSE(
[AC_LANG_SOURCE(
[[
@@
-53,7
+54,7
@@
main ()
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],
@@
-74,20
+75,18
@@
AC_DEFUN([gl_FUNC_FCHOWNAT],
AC_CHECK_FUNC([fchownat], [have_fchownat=yes], [have_fchownat=no])
if test $have_fchownat = yes; then
AC_CHECK_FUNC([fchownat], [have_fchownat=yes], [have_fchownat=no])
if test $have_fchownat = yes; then
- gl_FUNC_FCHOWNAT_DEREF_BUG([have_fchownat_bug=yes])
- if test $have_fchownat_bug = no; then
- use_replacement_fchownat=no
- fi
+ gl_FUNC_FCHOWNAT_DEREF_BUG([], [use_replacement_fchownat=no])
fi
if test $use_replacement_fchownat = yes; then
fi
if test $use_replacement_fchownat = yes; then
- AC_LIBOBJ(
fchownat
)
- AC_DEFINE(
fchownat, rpl_fchownat
,
+ AC_LIBOBJ(
[fchownat]
)
+ AC_DEFINE(
[fchownat], [rpl_fchownat]
,
[Define to rpl_fchownat if the replacement function should be used.])
fi
])
AC_DEFUN([gl_PREREQ_OPENAT],
[
[Define to rpl_fchownat if the replacement function should be used.])
fi
])
AC_DEFUN([gl_PREREQ_OPENAT],
[
- AC_REQUIRE([gl_SAVE_CWD])
+ AC_REQUIRE([gl_PROMOTED_TYPE_MODE_T])
+ :
])
])