From: Bruno Haible <bruno@clisp.org>
Date: Sun, 28 Sep 2008 11:44:29 +0000 (+0200)
Subject: New module 'posix_spawn_file_actions_addclose'.
X-Git-Tag: v0.1~6975
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=b69271fcc2ad65d62be67f4cdbfd7d02103d40cb;p=gnulib.git

New module 'posix_spawn_file_actions_addclose'.
---

diff --git a/ChangeLog b/ChangeLog
index b5bcd1d95..9b717dabe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-09-28  Bruno Haible  <bruno@clisp.org>
 
+	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
+	modifications.
+	* doc/posix-functions/posix_spawn_file_actions_addclose.texi: Mention
+	the new module.
+
 	New module 'posix_spawn_file_actions_init'.
 	* modules/posix_spawn_file_actions_init: New file.
 	* lib/spawn_faction_init.c: New file, from GNU libc with modifications.
diff --git a/doc/posix-functions/posix_spawn_file_actions_addclose.texi b/doc/posix-functions/posix_spawn_file_actions_addclose.texi
index a9223df42..687909189 100644
--- a/doc/posix-functions/posix_spawn_file_actions_addclose.texi
+++ b/doc/posix-functions/posix_spawn_file_actions_addclose.texi
@@ -4,15 +4,15 @@
 
 POSIX specification: @url{http://www.opengroup.org/susv3xsh/posix_spawn_file_actions_addclose.html}
 
-Gnulib module: ---
+Gnulib module: posix_spawn_file_actions_addclose
 
 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_addclose.c b/lib/spawn_faction_addclose.c
new file mode 100644
index 000000000..d2a03e81a
--- /dev/null
+++ b/lib/spawn_faction_addclose.c
@@ -0,0 +1,64 @@
+/* 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 <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <spawn.h>
+
+#include <errno.h>
+#include <unistd.h>
+
+#if !_LIBC
+# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#  include <stdio.h>
+#  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
+   `close' for the given file descriptor during the `spawn' call.  */
+int
+posix_spawn_file_actions_addclose (posix_spawn_file_actions_t *file_actions,
+				   int fd)
+{
+  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;
+
+  /* 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_close;
+  rec->action.open_action.fd = fd;
+
+  /* Account for the new entry.  */
+  ++file_actions->_used;
+
+  return 0;
+}
diff --git a/modules/posix_spawn_file_actions_addclose b/modules/posix_spawn_file_actions_addclose
new file mode 100644
index 000000000..865e6c508
--- /dev/null
+++ b/modules/posix_spawn_file_actions_addclose
@@ -0,0 +1,31 @@
+Description:
+posix_spawn_file_actions_addclose() function: augment a child process actions
+specification.
+
+Files:
+lib/spawn_faction_addclose.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_addclose])
+fi
+gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_addclose])
+
+Makefile.am:
+
+Include:
+<spawn.h>
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible, glibc
+