1
0
mirror of https://git.savannah.gnu.org/git/gnulib.git synced 2025-08-17 12:41:05 +03:00

dup2, fcntl, fcntl-h: port to AIX 7.1

This fixes some porting problems discovered when testing the latest
grep snapshot on AIX 7.1.  I don't think if fixes any bugs
in grep but it could be important for other applications.
* doc/posix-functions/dup2.texi:
* doc/posix-functions/fcntl.texi:
* doc/posix-headers/fcntl.texi:
Document AIX bugs.
* lib/fcntl.in.h (O_CLOEXEC, O_NOFOLLOW, O_TTY_INIT) [_AIX]:
Define to 0 if outside 'int' range.
* m4/dup2.m4 (gl_FUNC_DUP2):
* m4/fcntl.m4 (gl_FUNC_FCNTL):
Check for getdtablesize.  If it's available, test a value just
outside its range instead of testing 1000000.  When cross-compiling,
guess that AIX will fail this improved test.
This commit is contained in:
Paul Eggert
2014-05-31 14:07:57 -07:00
parent b1b4baa316
commit 93ce02b4fa
7 changed files with 64 additions and 7 deletions

View File

@@ -1,3 +1,21 @@
2014-05-31 Paul Eggert <eggert@cs.ucla.edu>
dup2, fcntl, fcntl-h: port to AIX 7.1
This fixes some porting problems discovered when testing the latest
grep snapshot on AIX 7.1. I don't think if fixes any bugs
in grep but it could be important for other applications.
* doc/posix-functions/dup2.texi:
* doc/posix-functions/fcntl.texi:
* doc/posix-headers/fcntl.texi:
Document AIX bugs.
* lib/fcntl.in.h (O_CLOEXEC, O_NOFOLLOW, O_TTY_INIT) [_AIX]:
Define to 0 if outside 'int' range.
* m4/dup2.m4 (gl_FUNC_DUP2):
* m4/fcntl.m4 (gl_FUNC_FCNTL):
Check for getdtablesize. If it's available, test a value just
outside its range instead of testing 1000000. When cross-compiling,
guess that AIX will fail this improved test.
2014-05-30 Paul Eggert <eggert@cs.ucla.edu> 2014-05-30 Paul Eggert <eggert@cs.ucla.edu>
printf, config.rpath: Port to FreeBSD 10. printf, config.rpath: Port to FreeBSD 10.

View File

@@ -39,9 +39,9 @@ Linux releases between July 2008 and May 2009 (versions 2.6.27 to 2.6.29).
@item @item
This function returns @code{EMFILE} instead of @code{EBADF} for This function returns @code{EMFILE} instead of @code{EBADF} for
extremely large targets, which interferes with using large targets, which interferes with using
@code{dup2(fd,fd)==fd)} as the minimal @code{EBADF} filter: @code{dup2(fd,fd)==fd)} as the minimal @code{EBADF} filter:
FreeBSD 6.1, Cygwin 1.5. AIX 7.1, FreeBSD 6.1, Cygwin 1.5.
@end itemize @end itemize
Portability problems fixed by Gnulib module @code{dup2-obsolete}: Portability problems fixed by Gnulib module @code{dup2-obsolete}:

View File

@@ -16,7 +16,7 @@ mingw, MSVC 9.
This function does not support @code{F_DUPFD_CLOEXEC} on some This function does not support @code{F_DUPFD_CLOEXEC} on some
platforms: platforms:
glibc with Linux kernels before 2.6.24, glibc with Linux kernels before 2.6.24,
Mac OS X 10.5, FreeBSD 6.0, NetBSD 5.0, OpenBSD 3.8, AIX 5.1, HP-UX 11, Mac OS X 10.5, FreeBSD 6.0, NetBSD 5.0, OpenBSD 3.8, AIX 7.1, HP-UX 11,
IRIX 6.5, OSF/1 5.1, Solaris 11 2010-11, Cygwin 1.7.1, Interix 3.5, IRIX 6.5, OSF/1 5.1, Solaris 11 2010-11, Cygwin 1.7.1, Interix 3.5,
BeOS. BeOS.
Note that the gnulib replacement code is functional but not atomic. Note that the gnulib replacement code is functional but not atomic.
@@ -24,7 +24,7 @@ Note that the gnulib replacement code is functional but not atomic.
@item @item
The @code{F_DUPFD} action of this function does not reject The @code{F_DUPFD} action of this function does not reject
out-of-range targets properly on some platforms: out-of-range targets properly on some platforms:
Cygwin 1.5.x, Haiku. AIX 7.1, Cygwin 1.5.x, Haiku.
@item @item
The @code{F_DUPFD} action of this function mistakenly clears The @code{F_DUPFD} action of this function mistakenly clears

View File

@@ -47,6 +47,11 @@ Cygwin.
portability to native Windows platforms) are defined on some platforms but portability to native Windows platforms) are defined on some platforms but
not on others. not on others.
@item
@samp{O_CLOEXEC}, @samp{O_NOFOLLOW}, and @samp{O_TTY_INIT}
are defined to values that are too large for an @code{int} on some platforms:
AIX 7.1 with XL C 12.1.
@item @item
@samp{O_DIRECT}, @samp{O_IGNORE_CTTY}, @samp{O_NDELAY}, @samp{O_DIRECT}, @samp{O_IGNORE_CTTY}, @samp{O_NDELAY},
@samp{O_NOATIME}, @samp{O_NOLINK}, @samp{O_NOLINKS}, and @samp{O_NOATIME}, @samp{O_NOLINK}, @samp{O_NOLINKS}, and

View File

@@ -186,6 +186,22 @@ _GL_WARN_ON_USE (openat, "openat is not portable - "
/* Fix up the O_* macros. */ /* Fix up the O_* macros. */
/* AIX 7.1 with XL C 12.1 defines O_CLOEXEC, O_NOFOLLOW, and O_TTY_INIT
to values outside 'int' range, so omit these misdefinitions.
But avoid namespace pollution on non-AIX systems. */
#ifdef _AIX
# include <limits.h>
# if defined O_CLOEXEC && ! (INT_MIN <= O_CLOEXEC && O_CLOEXEC <= INT_MAX)
# undef O_CLOEXEC
# endif
# if defined O_NOFOLLOW && ! (INT_MIN <= O_NOFOLLOW && O_NOFOLLOW <= INT_MAX)
# undef O_NOFOLLOW
# endif
# if defined O_TTY_INIT && ! (INT_MIN <= O_TTY_INIT && O_TTY_INIT <= INT_MAX)
# undef O_TTY_INIT
# endif
#endif
#if !defined O_DIRECT && defined O_DIRECTIO #if !defined O_DIRECT && defined O_DIRECTIO
/* Tru64 spells it 'O_DIRECTIO'. */ /* Tru64 spells it 'O_DIRECTIO'. */
# define O_DIRECT O_DIRECTIO # define O_DIRECT O_DIRECTIO

View File

@@ -8,6 +8,7 @@ AC_DEFUN([gl_FUNC_DUP2],
[ [
AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([AC_CANONICAL_HOST])
AC_CHECK_FUNCS_ONCE([getdtablesize])
m4_ifdef([gl_FUNC_DUP2_OBSOLETE], [ m4_ifdef([gl_FUNC_DUP2_OBSOLETE], [
AC_CHECK_FUNCS_ONCE([dup2]) AC_CHECK_FUNCS_ONCE([dup2])
if test $ac_cv_func_dup2 = no; then if test $ac_cv_func_dup2 = no; then
@@ -23,6 +24,11 @@ AC_DEFUN([gl_FUNC_DUP2],
#include <fcntl.h> #include <fcntl.h>
#include <errno.h>]], #include <errno.h>]],
[int result = 0; [int result = 0;
#ifdef HAVE_GETDTABLESIZE
int bad_fd = getdtablesize ();
#else
int bad_fd = 1000000;
#endif
#ifdef FD_CLOEXEC #ifdef FD_CLOEXEC
if (fcntl (1, F_SETFD, FD_CLOEXEC) == -1) if (fcntl (1, F_SETFD, FD_CLOEXEC) == -1)
result |= 1; result |= 1;
@@ -37,7 +43,7 @@ AC_DEFUN([gl_FUNC_DUP2],
if (dup2 (0, 0) != -1) if (dup2 (0, 0) != -1)
result |= 8; result |= 8;
/* Many gnulib modules require POSIX conformance of EBADF. */ /* Many gnulib modules require POSIX conformance of EBADF. */
if (dup2 (2, 1000000) == -1 && errno != EBADF) if (dup2 (2, bad_fd) == -1 && errno != EBADF)
result |= 16; result |= 16;
/* Flush out some cygwin core dumps. */ /* Flush out some cygwin core dumps. */
if (dup2 (2, -1) != -1 || errno != EBADF) if (dup2 (2, -1) != -1 || errno != EBADF)
@@ -56,7 +62,9 @@ AC_DEFUN([gl_FUNC_DUP2],
linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a
# closed fd may yield -EBADF instead of -1 / errno=EBADF. # closed fd may yield -EBADF instead of -1 / errno=EBADF.
gl_cv_func_dup2_works="guessing no" ;; gl_cv_func_dup2_works="guessing no" ;;
freebsd*) # on FreeBSD 6.1, dup2(1,1000000) gives EMFILE, not EBADF. aix* | freebsd*)
# on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE,
# not EBADF.
gl_cv_func_dup2_works="guessing no" ;; gl_cv_func_dup2_works="guessing no" ;;
haiku*) # on Haiku alpha 2, dup2(1, 1) resets FD_CLOEXEC. haiku*) # on Haiku alpha 2, dup2(1, 1) resets FD_CLOEXEC.
gl_cv_func_dup2_works="guessing no" ;; gl_cv_func_dup2_works="guessing no" ;;

View File

@@ -19,7 +19,7 @@ AC_DEFUN([gl_FUNC_FCNTL],
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) AC_REQUIRE([gl_FCNTL_H_DEFAULTS])
AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([AC_CANONICAL_HOST])
AC_CHECK_FUNCS_ONCE([fcntl]) AC_CHECK_FUNCS_ONCE([fcntl getdtablesize])
if test $ac_cv_func_fcntl = no; then if test $ac_cv_func_fcntl = no; then
gl_REPLACE_FCNTL gl_REPLACE_FCNTL
else else
@@ -28,11 +28,21 @@ AC_DEFUN([gl_FUNC_FCNTL],
AC_CACHE_CHECK([whether fcntl handles F_DUPFD correctly], AC_CACHE_CHECK([whether fcntl handles F_DUPFD correctly],
[gl_cv_func_fcntl_f_dupfd_works], [gl_cv_func_fcntl_f_dupfd_works],
[AC_RUN_IFELSE([AC_LANG_PROGRAM([[ [AC_RUN_IFELSE([AC_LANG_PROGRAM([[
#ifdef HAVE_GETDTABLESIZE
# include <unistd.h>
#endif
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
]], [[int result = 0; ]], [[int result = 0;
#ifdef HAVE_GETDTABLESIZE
int bad_fd = getdtablesize ();
#else
int bad_fd = 1000000;
#endif
if (fcntl (0, F_DUPFD, -1) != -1) result |= 1; if (fcntl (0, F_DUPFD, -1) != -1) result |= 1;
if (errno != EINVAL) result |= 2; if (errno != EINVAL) result |= 2;
if (fcntl (0, F_DUPFD, bad_fd) != -1) result |= 4;
if (errno != EINVAL) result |= 8;
return result; return result;
]])], ]])],
[gl_cv_func_fcntl_f_dupfd_works=yes], [gl_cv_func_fcntl_f_dupfd_works=yes],