From 23be8c8099f5adb14590f02b4a1c669ce49229f7 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 28 Sep 2008 13:46:16 +0200 Subject: [PATCH] New module 'posix_spawn_file_actions_adddup2'. --- ChangeLog | 7 +++ .../posix_spawn_file_actions_adddup2.texi | 8 +-- lib/spawn_faction_adddup2.c | 65 ++++++++++++++++++++++ modules/posix_spawn_file_actions_adddup2 | 31 +++++++++++ 4 files changed, 107 insertions(+), 4 deletions(-) create mode 100644 lib/spawn_faction_adddup2.c create mode 100644 modules/posix_spawn_file_actions_adddup2 diff --git a/ChangeLog b/ChangeLog index 9b717dabe..d12cca220 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2008-09-28 Bruno Haible + New module 'posix_spawn_file_actions_adddup2'. + * modules/posix_spawn_file_actions_adddup2: New file. + * lib/spawn_faction_adddup2.c: New file, from GNU libc with + modifications. + * doc/posix-functions/posix_spawn_file_actions_adddup2.texi: Mention + the new module. + New module 'posix_spawn_file_actions_addclose'. * modules/posix_spawn_file_actions_addclose: New file. * lib/spawn_faction_addclose.c: New file, from GNU libc with diff --git a/doc/posix-functions/posix_spawn_file_actions_adddup2.texi b/doc/posix-functions/posix_spawn_file_actions_adddup2.texi index 23851e456..d077c34c2 100644 --- a/doc/posix-functions/posix_spawn_file_actions_adddup2.texi +++ b/doc/posix-functions/posix_spawn_file_actions_adddup2.texi @@ -4,15 +4,15 @@ POSIX specification: @url{http://www.opengroup.org/susv3xsh/posix_spawn_file_actions_adddup2.html} -Gnulib module: --- +Gnulib module: posix_spawn_file_actions_adddup2 Portability problems fixed by Gnulib: @itemize +@item +This function is missing on some platforms: +MacOS X 10.3, FreeBSD 6.0, NetBSD 3.0, OpenBSD 3.8, AIX 5.1, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 9, Cygwin, mingw, Interix 3.5, BeOS. @end itemize Portability problems not fixed by Gnulib: @itemize -@item -This function is missing on some platforms: -MacOS X 10.3, FreeBSD 6.0, NetBSD 3.0, OpenBSD 3.8, AIX 5.1, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 9, Cygwin, mingw, Interix 3.5, BeOS. @end itemize diff --git a/lib/spawn_faction_adddup2.c b/lib/spawn_faction_adddup2.c new file mode 100644 index 000000000..e86196009 --- /dev/null +++ b/lib/spawn_faction_adddup2.c @@ -0,0 +1,65 @@ +/* Copyright (C) 2000 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include + +/* Specification. */ +#include + +#include +#include + +#if !_LIBC +# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# include +# define __sysconf(open_max) _getmaxstdio () +# else +# define __sysconf(open_max) getdtablesize () +# endif +#endif + +#include "spawn_int.h" + +/* Add an action to FILE-ACTIONS which tells the implementation to call + `dup2' for the given file descriptors during the `spawn' call. */ +int +posix_spawn_file_actions_adddup2 (posix_spawn_file_actions_t *file_actions, + int fd, int newfd) +{ + int maxfd = __sysconf (_SC_OPEN_MAX); + struct __spawn_action *rec; + + /* Test for the validity of the file descriptor. */ + if (fd < 0 || newfd < 0 || fd >= maxfd || newfd >= maxfd) + return EBADF; + + /* 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_dup2; + rec->action.dup2_action.fd = fd; + rec->action.dup2_action.newfd = newfd; + + /* Account for the new entry. */ + ++file_actions->_used; + + return 0; +} diff --git a/modules/posix_spawn_file_actions_adddup2 b/modules/posix_spawn_file_actions_adddup2 new file mode 100644 index 000000000..3b8a7a012 --- /dev/null +++ b/modules/posix_spawn_file_actions_adddup2 @@ -0,0 +1,31 @@ +Description: +posix_spawn_file_actions_adddup2() function: augment a child process actions +specification. + +Files: +lib/spawn_faction_adddup2.c +lib/spawn_int.h +m4/posix_spawn.m4 + +Depends-on: +spawn + +configure.ac: +gl_POSIX_SPAWN +if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then + gl_REPLACE_SPAWN_H + AC_LIBOBJ([spawn_faction_adddup2]) +fi +gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_adddup2]) + +Makefile.am: + +Include: + + +License: +LGPL + +Maintainer: +Bruno Haible, glibc + -- 2.11.0