mirror of
https://https.git.savannah.gnu.org/git/gnulib.git
synced 2026-05-13 15:13:36 +00:00
86b1dc8935
Suggested by Eric Blake in <https://lists.gnu.org/archive/html/bug-findutils/2018-09/msg00007.html>. * lib/spawn.in.h (posix_spawn_file_actions_addchdir): New declaration. * lib/spawn_int.h (struct __spawn_action): Add tag 'spawn_do_chdir' and union member 'chdir_action'. * lib/spawn_faction_addchdir.c: New file. * lib/spawni.c (__spawni): Implement the spawn_do_chdir action. * lib/spawn_faction_addclose.c: Test REPLACE_POSIX_SPAWN instead of HAVE_WORKING_POSIX_SPAWN. * lib/spawn_faction_adddup2.c: Likewise. * lib/spawn_faction_addopen.c: Likewise. * m4/posix_spawn_faction_addchdir.m4: New file. * m4/posix_spawn.m4 (gl_POSIX_SPAWN_BODY): Test whether module 'posix_spawn_file_actions_addchdir' is present and whether posix_spawn_file_actions_addchdir_np exists. Define REPLACE_POSIX_SPAWN instead of HAVE_WORKING_POSIX_SPAWN. * m4/spawn_h.m4 (gl_SPAWN_H): Test whether posix_spawn_file_actions_addchdir is declared. (gl_SPAWN_H_DEFAULTS): Initialize GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR, HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR, REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR. * modules/spawn (Makefile.am): Substitute GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR, HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR, REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR. * modules/posix_spawn_file_actions_addchdir: New file. * modules/posix_spawn_file_actions_addclose (Depends-on, configure.ac): Test also REPLACE_POSIX_SPAWN. * modules/posix_spawn_file_actions_adddup2 (Depends-on, configure.ac): Likewise. * modules/posix_spawn_file_actions_addopen (Depends-on, configure.ac): Likewise. * tests/test-spawn-c++.cc (posix_spawn_file_actions_addchdir): Check signature. * doc/posix-functions/posix_spawn.texi: Mention the new module. * doc/posix-functions/posix_spawnp.texi: Likewise.
71 lines
2.1 KiB
C
71 lines
2.1 KiB
C
/* Copyright (C) 2000, 2009-2018 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 <https://www.gnu.org/licenses/>. */
|
|
|
|
#include <config.h>
|
|
|
|
/* Specification. */
|
|
#include <spawn.h>
|
|
|
|
#include <errno.h>
|
|
#include <unistd.h>
|
|
|
|
#if !_LIBC
|
|
# define __sysconf(open_max) getdtablesize ()
|
|
#endif
|
|
|
|
#if REPLACE_POSIX_SPAWN
|
|
# include "spawn_int.h"
|
|
#endif
|
|
|
|
/* 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)
|
|
#undef posix_spawn_file_actions_adddup2
|
|
{
|
|
int maxfd = __sysconf (_SC_OPEN_MAX);
|
|
|
|
/* Test for the validity of the file descriptor. */
|
|
if (fd < 0 || newfd < 0 || fd >= maxfd || newfd >= maxfd)
|
|
return EBADF;
|
|
|
|
#if !REPLACE_POSIX_SPAWN
|
|
return posix_spawn_file_actions_adddup2 (file_actions, fd, newfd);
|
|
#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;
|
|
|
|
{
|
|
struct __spawn_action *rec;
|
|
|
|
/* 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;
|
|
}
|
|
#endif
|
|
}
|