From e0ac772ccb7b897a73520c5707db43c8d2bd0bca Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 8 Jan 2012 22:31:53 +0100 Subject: [PATCH] posix_spawn_file_actions_addopen: Work around Solaris 11 2011-11 bug. * m4/spawn_h.m4 (gl_SPAWN_H_DEFAULTS): Initialize REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN. * m4/posix_spawn.m4 (gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN): New macro. * lib/spawn.in.h (posix_spawn_file_actions_addopen): Test REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN, not REPLACE_POSIX_SPAWN. * lib/spawn_faction_addopen.c: Add workaround implementation if HAVE_WORKING_POSIX_SPAWN. * modules/spawn (Makefile): Substitute REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN. * modules/posix_spawn_file_actions_addopen (configure.ac): Invoke gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN. Test REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN, not REPLACE_POSIX_SPAWN. (Depends-on): Update conditions. * doc/posix-functions/posix_spawn_file_actions_addopen.texi: Mention the Solaris 11 bug. --- ChangeLog | 20 +++++++++++ .../posix_spawn_file_actions_addopen.texi | 3 ++ lib/spawn.in.h | 2 +- lib/spawn_faction_addopen.c | 34 +++++++++++------- m4/posix_spawn.m4 | 42 ++++++++++++++++++++++ m4/spawn_h.m4 | 2 ++ modules/posix_spawn_file_actions_addopen | 8 ++--- modules/spawn | 1 + 8 files changed, 95 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 39af8aa6b..af51f88e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,25 @@ 2012-01-08 Bruno Haible + posix_spawn_file_actions_addopen: Work around Solaris 11 2011-11 bug. + * m4/spawn_h.m4 (gl_SPAWN_H_DEFAULTS): Initialize + REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN. + * m4/posix_spawn.m4 (gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN): New + macro. + * lib/spawn.in.h (posix_spawn_file_actions_addopen): Test + REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN, not REPLACE_POSIX_SPAWN. + * lib/spawn_faction_addopen.c: Add workaround implementation if + HAVE_WORKING_POSIX_SPAWN. + * modules/spawn (Makefile): Substitute + REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN. + * modules/posix_spawn_file_actions_addopen (configure.ac): Invoke + gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN. Test + REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN, not REPLACE_POSIX_SPAWN. + (Depends-on): Update conditions. + * doc/posix-functions/posix_spawn_file_actions_addopen.texi: Mention + the Solaris 11 bug. + +2012-01-08 Bruno Haible + posix_spawn_file_actions_adddup2: Work around Solaris 11 2011-11 bug. * m4/spawn_h.m4 (gl_SPAWN_H_DEFAULTS): Initialize REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2. diff --git a/doc/posix-functions/posix_spawn_file_actions_addopen.texi b/doc/posix-functions/posix_spawn_file_actions_addopen.texi index c69944a3a..9e42cd07b 100644 --- a/doc/posix-functions/posix_spawn_file_actions_addopen.texi +++ b/doc/posix-functions/posix_spawn_file_actions_addopen.texi @@ -11,6 +11,9 @@ Portability problems fixed by Gnulib: @item This function is missing on some platforms: MacOS X 10.4, FreeBSD 6.0, NetBSD 5.0, OpenBSD 3.8, Minix 3.1.8, AIX 5.1, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 9, Cygwin, mingw, MSVC 9, Interix 3.5, BeOS. +@item +This function does not reject a too large file descriptor on some platforms: +Solaris 11 2011-11. @end itemize Portability problems not fixed by Gnulib: diff --git a/lib/spawn.in.h b/lib/spawn.in.h index aa5aaf3f0..0f25d1762 100644 --- a/lib/spawn.in.h +++ b/lib/spawn.in.h @@ -774,7 +774,7 @@ _GL_WARN_ON_USE (posix_spawn_file_actions_destroy, #if @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@ /* Add an action to FILE-ACTIONS which tells the implementation to call 'open' for the given file during the 'spawn' call. */ -# if @REPLACE_POSIX_SPAWN@ +# if @REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawn_file_actions_addopen rpl_posix_spawn_file_actions_addopen # endif diff --git a/lib/spawn_faction_addopen.c b/lib/spawn_faction_addopen.c index 82e60c0a4..d13fc2c59 100644 --- a/lib/spawn_faction_addopen.c +++ b/lib/spawn_faction_addopen.c @@ -26,7 +26,9 @@ # define __sysconf(open_max) getdtablesize () #endif -#include "spawn_int.h" +#if !HAVE_WORKING_POSIX_SPAWN +# include "spawn_int.h" +#endif /* Add an action to FILE-ACTIONS which tells the implementation to call 'open' for the given file during the 'spawn' call. */ @@ -34,30 +36,38 @@ int posix_spawn_file_actions_addopen (posix_spawn_file_actions_t *file_actions, int fd, const char *path, int oflag, mode_t mode) +#undef posix_spawn_file_actions_addopen { int maxfd = __sysconf (_SC_OPEN_MAX); - struct __spawn_action *rec; /* Test for the validity of the file descriptor. */ if (fd < 0 || fd >= maxfd) return EBADF; +#if HAVE_WORKING_POSIX_SPAWN + return posix_spawn_file_actions_addopen (file_actions, fd, path, oflag, mode); +#else /* Allocate more memory if needed. */ if (file_actions->_used == file_actions->_allocated && __posix_spawn_file_actions_realloc (file_actions) != 0) /* This can only mean we ran out of memory. */ return ENOMEM; - /* Add the new value. */ - rec = &file_actions->_actions[file_actions->_used]; - rec->tag = spawn_do_open; - rec->action.open_action.fd = fd; - rec->action.open_action.path = path; - rec->action.open_action.oflag = oflag; - rec->action.open_action.mode = mode; + { + struct __spawn_action *rec; + + /* Add the new value. */ + rec = &file_actions->_actions[file_actions->_used]; + rec->tag = spawn_do_open; + rec->action.open_action.fd = fd; + rec->action.open_action.path = path; + rec->action.open_action.oflag = oflag; + rec->action.open_action.mode = mode; - /* Account for the new entry. */ - ++file_actions->_used; + /* Account for the new entry. */ + ++file_actions->_used; - return 0; + return 0; + } +#endif } diff --git a/m4/posix_spawn.m4 b/m4/posix_spawn.m4 index d0a734d09..4fad17fcc 100644 --- a/m4/posix_spawn.m4 +++ b/m4/posix_spawn.m4 @@ -482,3 +482,45 @@ int main () esac fi ]) + +AC_DEFUN([gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN], +[ + AC_REQUIRE([gl_SPAWN_H_DEFAULTS]) + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + gl_POSIX_SPAWN + if test $REPLACE_POSIX_SPAWN = 1; then + REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN=1 + else + dnl On Solaris 11 2011-11, posix_spawn_file_actions_addopen succeeds even + dnl if the fd argument is out of range. + AC_CACHE_CHECK([whether posix_spawn_file_actions_addopen works], + [gl_cv_func_posix_spawn_file_actions_addopen_works], + [AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ +#include +int main () +{ + posix_spawn_file_actions_t actions; + if (posix_spawn_file_actions_init (&actions) != 0) + return 1; + if (posix_spawn_file_actions_addopen (&actions, 10000000, "foo", 0, O_RDONLY) + == 0) + return 2; + return 0; +}]])], + [gl_cv_func_posix_spawn_file_actions_addopen_works=yes], + [gl_cv_func_posix_spawn_file_actions_addopen_works=no], + [# Guess no on Solaris, yes otherwise. + case "$host_os" in + solaris*) gl_cv_func_posix_spawn_file_actions_addopen_works="guessing no";; + *) gl_cv_func_posix_spawn_file_actions_addopen_works="guessing yes";; + esac + ]) + ]) + case "$gl_cv_func_posix_spawn_file_actions_addopen_works" in + *yes) ;; + *) REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN=1 ;; + esac + fi +]) diff --git a/m4/spawn_h.m4 b/m4/spawn_h.m4 index ef56fb01f..26fec8e10 100644 --- a/m4/spawn_h.m4 +++ b/m4/spawn_h.m4 @@ -112,4 +112,6 @@ AC_DEFUN([gl_SPAWN_H_DEFAULTS], AC_SUBST([REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE]) REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2=0; AC_SUBST([REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2]) + REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN=0; + AC_SUBST([REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN]) ]) diff --git a/modules/posix_spawn_file_actions_addopen b/modules/posix_spawn_file_actions_addopen index 0af24972d..585fd446a 100644 --- a/modules/posix_spawn_file_actions_addopen +++ b/modules/posix_spawn_file_actions_addopen @@ -9,12 +9,12 @@ m4/posix_spawn.m4 Depends-on: spawn -getdtablesize [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1] -posix_spawn_file_actions_init [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1] +getdtablesize [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = 1] +posix_spawn_file_actions_init [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = 1] configure.ac: -gl_POSIX_SPAWN -if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then +gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN +if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = 1; then AC_LIBOBJ([spawn_faction_addopen]) fi gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_addopen]) diff --git a/modules/spawn b/modules/spawn index 866bdb104..047fbdf9a 100644 --- a/modules/spawn +++ b/modules/spawn @@ -56,6 +56,7 @@ spawn.h: spawn.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''REPLACE_POSIX_SPAWN''@|$(REPLACE_POSIX_SPAWN)|g' \ -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE)|g' \ -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2)|g' \ + -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ -- 2.11.0