Discussion:
[PATCH] posix: New function posix_spawn_file_actions_addfchdir_np [BZ #17405]
(too old to reply)
Florian Weimer
2018-11-30 13:44:29 UTC
Permalink
This will need porting to Hurd (currently it results in a -Werror
failure); it should be easier than the last time. Since the
cross-buildbot is broken right now anyway, I intend to commit this once
the generic/Linux portion is approved.

Thanks,
Florian

-----
2018-11-30 Florian Weimer <***@redhat.com>

[BZ #17405]
* posix/Makefile (routines): Add spawn_faction_addfchdir.
* posix/Versions (GLIBC_2.29): Export
posix_spawn_file_actions_addfchdir_np.
* posix/spawn.h (posix_spawn_file_actions_addfchdir_np): Declare.
* posix/spawn_faction_destroy.c
(__posix_spawn_file_actions_destroy): Handle spawn_do_fchdir.
* posix/spawn_int.h (struct __spawn_action): Add spawn_do_fchdir
and the field action.fchdir_action.
* posix/tst-spawn-chdir.c (add_chdir): New function.
(do_test): Add do_fchdir loop. Call add_chdir.
* sysdeps/posix/spawni.c (__spawni_child): Handle spawn_do_fchdir.
* sysdeps/unix/sysv/linux/spawni.c (__spawni_child): Likewise.
* sysdeps/mach/hurd/i386/libc.abilist (GLIBC_2.29): Add
posix_spawn_file_actions_addfchdir_np.
* sysdeps/unix/sysv/linux/aarch64/libc.abilist (GLIBC_2.29):
Likewise.
* sysdeps/unix/sysv/linux/alpha/libc.abilist (GLIBC_2.29):
Likewise.
* sysdeps/unix/sysv/linux/arm/libc.abilist (GLIBC_2.29): Likewise.
* sysdeps/unix/sysv/linux/hppa/libc.abilist (GLIBC_2.29):
Likewise.
* sysdeps/unix/sysv/linux/i386/libc.abilist (GLIBC_2.29):
Likewise.
* sysdeps/unix/sysv/linux/ia64/libc.abilist (GLIBC_2.29):
Likewise.
* sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist (GLIBC_2.29):
Likewise.
* sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist (GLIBC_2.29):
Likewise.
* sysdeps/unix/sysv/linux/microblaze/libc.abilist (GLIBC_2.29):
Likewise.
* sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
(GLIBC_2.29): Likewise.
* sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
(GLIBC_2.29): Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
(GLIBC_2.29): Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
(GLIBC_2.29): Likewise.
* sysdeps/unix/sysv/linux/nios2/libc.abilist (GLIBC_2.29):
Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
(GLIBC_2.29): Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
(GLIBC_2.29): Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist
(GLIBC_2.29): Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist
(GLIBC_2.29): Likewise.
* sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist (GLIBC_2.29):
Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist (GLIBC_2.29):
Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist (GLIBC_2.29):
Likewise.
* sysdeps/unix/sysv/linux/sh/libc.abilist (GLIBC_2.29): Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist (GLIBC_2.29):
Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist (GLIBC_2.29):
Likewise.
* sysdeps/unix/sysv/linux/x86_64/64/libc.abilist (GLIBC_2.29):
Likewise.
* sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist (GLIBC_2.29):
Likewise.

diff --git a/NEWS b/NEWS
index 1098be1afb..c2fa2f7a85 100644
--- a/NEWS
+++ b/NEWS
@@ -30,10 +30,12 @@ Major new features:
HTM state is saved and restore lazily (the state being saved even when the
process actually does not use HTM).

-* The posix_spawn_file_actions_addchdir_np function has been added,
- enabling posix_spawn and posix_spawnp to run the new process in a
- different directory. This is a GNU extension and similar to the
- Solaris function of the same name.
+* The functions posix_spawn_file_actions_addchdir_np and
+ posix_spawn_file_actions_addfchdir_np have been added, enabling
+ posix_spawn and posix_spawnp to run the new process in a different
+ directory. These functions are GNU extensions. The function
+ posix_spawn_file_actions_addchdir_np is similar to the Solaris function of
+ the same name.

Deprecated and removed features, and other changes affecting compatibility:

diff --git a/posix/Makefile b/posix/Makefile
index a8fb1e1839..d5a6844c88 100644
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -55,7 +55,7 @@ routines := \
pread pwrite pread64 pwrite64 \
spawn_faction_init spawn_faction_destroy spawn_faction_addclose \
spawn_faction_addopen spawn_faction_adddup2 spawn_valid_fd \
- spawn_faction_addchdir \
+ spawn_faction_addchdir spawn_faction_addfchdir \
spawnattr_init spawnattr_destroy \
spawnattr_getdefault spawnattr_setdefault \
spawnattr_getflags spawnattr_setflags \
diff --git a/posix/Versions b/posix/Versions
index 56ab921562..ad693ae9a7 100644
--- a/posix/Versions
+++ b/posix/Versions
@@ -139,6 +139,7 @@ libc {
}
GLIBC_2.29 {
posix_spawn_file_actions_addchdir_np;
+ posix_spawn_file_actions_addfchdir_np;
}
GLIBC_PRIVATE {
__libc_fork; __libc_pread; __libc_pwrite;
diff --git a/posix/spawn.h b/posix/spawn.h
index c84ee4bf72..8c40b4d28b 100644
--- a/posix/spawn.h
+++ b/posix/spawn.h
@@ -190,6 +190,12 @@ extern int posix_spawn_file_actions_adddup2 (posix_spawn_file_actions_t *
affects the subsequent file actions. */
extern int posix_spawn_file_actions_addchdir_np (posix_spawn_file_actions_t *,
const char *__path) __THROW;
+
+/* Add an action changing the directory to FD during spawn. This
+ affects the subsequent file actions. FD is not duplicated and must
+ be open when the file action is executed. */
+extern int posix_spawn_file_actions_addfchdir_np (posix_spawn_file_actions_t *,
+ int __fd) __THROW;
#endif

__END_DECLS
diff --git a/posix/spawn_faction_addfchdir.c b/posix/spawn_faction_addfchdir.c
new file mode 100644
index 0000000000..6f069df29e
--- /dev/null
+++ b/posix/spawn_faction_addfchdir.c
@@ -0,0 +1,46 @@
+/* Add a directory change to a file action list for posix_spawn.
+ Copyright (C) 2000-2018 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <errno.h>
+#include <spawn.h>
+#include <string.h>
+
+#include "spawn_int.h"
+
+int
+posix_spawn_file_actions_addfchdir_np (posix_spawn_file_actions_t *actions,
+ int fd)
+{
+ struct __spawn_action *rec;
+
+ /* Allocate more memory if needed. */
+ if (actions->__used == actions->__allocated
+ && __posix_spawn_file_actions_realloc (actions) != 0)
+ /* This can only mean we ran out of memory. */
+ return ENOMEM;
+
+ /* Add the new value. */
+ rec = &actions->__actions[actions->__used];
+ rec->tag = spawn_do_fchdir;
+ rec->action.fchdir_action.fd = fd;
+
+ /* Account for the new entry. */
+ ++actions->__used;
+
+ return 0;
+}
diff --git a/posix/spawn_faction_destroy.c b/posix/spawn_faction_destroy.c
index 05ca9dc13b..da172a894e 100644
--- a/posix/spawn_faction_destroy.c
+++ b/posix/spawn_faction_destroy.c
@@ -38,6 +38,7 @@ __posix_spawn_file_actions_destroy (posix_spawn_file_actions_t *file_actions)
break;
case spawn_do_close:
case spawn_do_dup2:
+ case spawn_do_fchdir:
/* No cleanup required. */
break;
}
diff --git a/posix/spawn_int.h b/posix/spawn_int.h
index 9db35553c2..0d0e438ff6 100644
--- a/posix/spawn_int.h
+++ b/posix/spawn_int.h
@@ -31,6 +31,7 @@ struct __spawn_action
spawn_do_dup2,
spawn_do_open,
spawn_do_chdir,
+ spawn_do_fchdir,
} tag;

union
@@ -55,6 +56,10 @@ struct __spawn_action
{
char *path;
} chdir_action;
+ struct
+ {
+ int fd;
+ } fchdir_action;
} action;
};

diff --git a/posix/tst-spawn-chdir.c b/posix/tst-spawn-chdir.c
index dc14f2059b..8f447955c1 100644
--- a/posix/tst-spawn-chdir.c
+++ b/posix/tst-spawn-chdir.c
@@ -20,11 +20,13 @@
#include <errno.h>
#include <fcntl.h>
#include <spawn.h>
+#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
#include <support/check.h>
#include <support/support.h>
#include <support/temp_file.h>
+#include <support/test-driver.h>
#include <support/xstdio.h>
#include <support/xunistd.h>
#include <unistd.h>
@@ -64,6 +66,24 @@ get_pwd_program (void)
FAIL_EXIT1 ("cannot find pwd program");
}

+/* Adds chdir operations to ACTIONS, using PATH. If DO_FCHDIR, use
+ the open function and TMPFD to emulate chdir using fchdir. */
+static void
+add_chdir (posix_spawn_file_actions_t *actions, const char *path,
+ bool do_fchdir, int tmpfd)
+{
+ if (do_fchdir)
+ {
+ TEST_COMPARE (posix_spawn_file_actions_addopen
+ (actions, tmpfd, path, O_DIRECTORY | O_RDONLY, 0), 0);
+ TEST_COMPARE (posix_spawn_file_actions_addfchdir_np
+ (actions, tmpfd), 0);
+ TEST_COMPARE (posix_spawn_file_actions_addclose (actions, tmpfd), 0);
+ }
+ else
+ TEST_COMPARE (posix_spawn_file_actions_addchdir_np (actions, path), 0);
+}
+
static int
do_test (void)
{
@@ -87,102 +107,108 @@ do_test (void)
int iteration = 0;
for (int do_spawnp = 0; do_spawnp < 2; ++do_spawnp)
for (int do_overwrite = 0; do_overwrite < 2; ++do_overwrite)
- {
- ++iteration;
- printf ("info: iteration=%d do_spawnp=%d do_overwrite=%d\n",
- iteration, do_spawnp, do_overwrite);
+ for (int do_fchdir = 0; do_fchdir < 2; ++do_fchdir)
+ {
+ /* This subtest does not make sense for fchdir. */
+ if (do_overwrite && do_fchdir)
+ continue;

- /* The "pwd" program runs in this directory. */
- char *iteration_directory = xasprintf ("%s/%d", directory, iteration);
- add_temp_file (iteration_directory);
- xmkdir (iteration_directory, 0777);
+ ++iteration;
+ if (test_verbose > 0)
+ printf ("info: iteration=%d do_spawnp=%d do_overwrite=%d"
+ " do_fchdir=%d\n",
+ iteration, do_spawnp, do_overwrite, do_fchdir);

- /* This file receives output from "pwd". */
- char *output_file_path
- = xasprintf ("%s/output-file", iteration_directory);
- add_temp_file (output_file_path);
+ /* The "pwd" program runs in this directory. */
+ char *iteration_directory = xasprintf ("%s/%d", directory, iteration);
+ add_temp_file (iteration_directory);
+ xmkdir (iteration_directory, 0777);

- /* This subdirectory is used for chdir ordering checks. */
- char *subdir_path = xasprintf ("%s/subdir", iteration_directory);
- add_temp_file (subdir_path);
- xmkdir (subdir_path, 0777);
+ /* This file receives output from "pwd". */
+ char *output_file_path
+ = xasprintf ("%s/output-file", iteration_directory);
+ add_temp_file (output_file_path);

- /* Also used for checking the order of actions. */
- char *probe_file_path
- = xasprintf ("%s/subdir/probe-file", iteration_directory);
- add_temp_file (probe_file_path);
- TEST_COMPARE (access (probe_file_path, F_OK), -1);
- TEST_COMPARE (errno, ENOENT);
+ /* This subdirectory is used for chdir ordering checks. */
+ char *subdir_path = xasprintf ("%s/subdir", iteration_directory);
+ add_temp_file (subdir_path);
+ xmkdir (subdir_path, 0777);

- /* This symbolic link is used in a relative path with
- posix_spawn. */
- char *pwd_symlink_path
- = xasprintf ("%s/subdir/pwd-symlink", iteration_directory);
- xsymlink (get_pwd_program (), pwd_symlink_path);
- add_temp_file (pwd_symlink_path);
+ /* Also used for checking the order of actions. */
+ char *probe_file_path
+ = xasprintf ("%s/subdir/probe-file", iteration_directory);
+ add_temp_file (probe_file_path);
+ TEST_COMPARE (access (probe_file_path, F_OK), -1);
+ TEST_COMPARE (errno, ENOENT);

- posix_spawn_file_actions_t actions;
- TEST_COMPARE (posix_spawn_file_actions_init (&actions), 0);
- TEST_COMPARE (posix_spawn_file_actions_addchdir_np
- (&actions, subdir_path), 0);
- TEST_COMPARE (posix_spawn_file_actions_addopen
- (&actions, 3, /* Arbitrary unused descriptor. */
- "probe-file",
- O_WRONLY | O_CREAT | O_EXCL, 0777), 0);
- TEST_COMPARE (posix_spawn_file_actions_addclose (&actions, 3), 0);
- /* Run the actual in iteration_directory. */
- TEST_COMPARE (posix_spawn_file_actions_addchdir_np (&actions, ".."), 0);
- TEST_COMPARE (posix_spawn_file_actions_addopen
- (&actions, STDOUT_FILENO, "output-file",
- O_WRONLY | O_CREAT | O_EXCL, 0777), 0);
+ /* This symbolic link is used in a relative path with
+ posix_spawn. */
+ char *pwd_symlink_path
+ = xasprintf ("%s/subdir/pwd-symlink", iteration_directory);
+ xsymlink (get_pwd_program (), pwd_symlink_path);
+ add_temp_file (pwd_symlink_path);

- /* Check that posix_spawn_file_actions_addchdir_np made a copy
- of the path. */
- if (do_overwrite)
- subdir_path[0] = '\0';
+ posix_spawn_file_actions_t actions;
+ TEST_COMPARE (posix_spawn_file_actions_init (&actions), 0);
+ add_chdir (&actions, subdir_path, do_fchdir, 4);
+ TEST_COMPARE (posix_spawn_file_actions_addopen
+ (&actions, 3, /* Arbitrary unused descriptor. */
+ "probe-file",
+ O_WRONLY | O_CREAT | O_EXCL, 0777), 0);
+ TEST_COMPARE (posix_spawn_file_actions_addclose (&actions, 3), 0);
+ /* Run the actual in iteration_directory. */
+ add_chdir (&actions, "..", do_fchdir, 5);
+ TEST_COMPARE (posix_spawn_file_actions_addopen
+ (&actions, STDOUT_FILENO, "output-file",
+ O_WRONLY | O_CREAT | O_EXCL, 0777), 0);

- char *const argv[] = { (char *) "pwd", NULL };
- char *const envp[] = { NULL } ;
- pid_t pid;
- if (do_spawnp)
- TEST_COMPARE (posix_spawnp (&pid, "pwd", &actions,
- NULL, argv, envp), 0);
- else
- TEST_COMPARE (posix_spawn (&pid, "subdir/pwd-symlink", &actions,
- NULL, argv, envp), 0);
- TEST_VERIFY (pid > 0);
- int status;
- xwaitpid (pid, &status, 0);
- TEST_COMPARE (status, 0);
+ /* Check that posix_spawn_file_actions_addchdir_np made a copy
+ of the path. */
+ if (do_overwrite)
+ subdir_path[0] = '\0';

- /* Check that the current directory did not change. */
- {
- char *cwd = get_current_dir_name ();
- if (cwd == NULL)
- FAIL_EXIT1 ("get_current_dir_name: %m");
- TEST_COMPARE_BLOB (original_cwd, strlen (original_cwd),
- cwd, strlen (cwd));
- free (cwd);
- }
+ char *const argv[] = { (char *) "pwd", NULL };
+ char *const envp[] = { NULL } ;
+ pid_t pid;
+ if (do_spawnp)
+ TEST_COMPARE (posix_spawnp (&pid, "pwd", &actions,
+ NULL, argv, envp), 0);
+ else
+ TEST_COMPARE (posix_spawn (&pid, "subdir/pwd-symlink", &actions,
+ NULL, argv, envp), 0);
+ TEST_VERIFY (pid > 0);
+ int status;
+ xwaitpid (pid, &status, 0);
+ TEST_COMPARE (status, 0);

+ /* Check that the current directory did not change. */
+ {
+ char *cwd = get_current_dir_name ();
+ if (cwd == NULL)
+ FAIL_EXIT1 ("get_current_dir_name: %m");
+ TEST_COMPARE_BLOB (original_cwd, strlen (original_cwd),
+ cwd, strlen (cwd));
+ free (cwd);
+ }

- /* Check the output from "pwd". */
- {
- char *pwd = read_one_line (output_file_path);
- TEST_COMPARE_BLOB (iteration_directory, strlen (iteration_directory),
- pwd, strlen (pwd));
- free (pwd);
- }

- /* This file must now exist. */
- TEST_COMPARE (access (probe_file_path, F_OK), 0);
+ /* Check the output from "pwd". */
+ {
+ char *pwd = read_one_line (output_file_path);
+ TEST_COMPARE_BLOB (iteration_directory, strlen (iteration_directory),
+ pwd, strlen (pwd));
+ free (pwd);
+ }
+
+ /* This file must now exist. */
+ TEST_COMPARE (access (probe_file_path, F_OK), 0);

- TEST_COMPARE (posix_spawn_file_actions_destroy (&actions), 0);
- free (pwd_symlink_path);
- free (probe_file_path);
- free (subdir_path);
- free (output_file_path);
- }
+ TEST_COMPARE (posix_spawn_file_actions_destroy (&actions), 0);
+ free (pwd_symlink_path);
+ free (probe_file_path);
+ free (subdir_path);
+ free (output_file_path);
+ }

free (directory);

diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index d4c4a91c84..450430237d 100644
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -2040,6 +2040,7 @@ GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.29 _hurd_port_move F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
diff --git a/sysdeps/posix/spawni.c b/sysdeps/posix/spawni.c
index c42fbd590e..18ccbddc98 100644
--- a/sysdeps/posix/spawni.c
+++ b/sysdeps/posix/spawni.c
@@ -214,6 +214,11 @@ __spawni_child (void *arguments)
if (__chdir (action->action.chdir_action.path) != 0)
goto fail;
break;
+
+ case spawn_do_fchdir:
+ if (__fchdir (action->action.fchdir_action.fd) != 0)
+ goto fail;
+ break;
}
}
}
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index e66c741d04..8763e7b618 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -2139,3 +2139,4 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index 8df162fe99..c7dfef32d6 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -2034,6 +2034,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
diff --git a/sysdeps/unix/sysv/linux/arm/libc.abilist b/sysdeps/unix/sysv/linux/arm/libc.abilist
index 43c804f9dc..a306d13a0f 100644
--- a/sysdeps/unix/sysv/linux/arm/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/libc.abilist
@@ -124,6 +124,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.4 _Exit F
GLIBC_2.4 _IO_2_1_stderr_ D 0xa0
GLIBC_2.4 _IO_2_1_stdin_ D 0xa0
diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
index 88b01c2e75..4285936c2c 100644
--- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
@@ -1881,6 +1881,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist
index 6d02f31612..d190399192 100644
--- a/sysdeps/unix/sysv/linux/i386/libc.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libc.abilist
@@ -2046,6 +2046,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
index 4249712611..918daeb348 100644
--- a/sysdeps/unix/sysv/linux/ia64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist
@@ -1915,6 +1915,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
index d47b808862..c9e534cf8b 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
@@ -125,6 +125,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.4 _Exit F
GLIBC_2.4 _IO_2_1_stderr_ D 0x98
GLIBC_2.4 _IO_2_1_stdin_ D 0x98
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
index d5e38308be..c8e70be876 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
@@ -1990,6 +1990,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
diff --git a/sysdeps/unix/sysv/linux/microblaze/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/libc.abilist
index 8596b84399..e356ec6d33 100644
--- a/sysdeps/unix/sysv/linux/microblaze/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/libc.abilist
@@ -2131,3 +2131,4 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
index 88e0f896d5..3154251d25 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
@@ -1968,6 +1968,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
index aff7462c34..e9445adf14 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
@@ -1966,6 +1966,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
index 71d82444aa..4043077bc3 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
@@ -1974,6 +1974,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
index de6c53d293..e47cb434dc 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
@@ -1969,6 +1969,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist
index e724bab9fb..024c55f29e 100644
--- a/sysdeps/unix/sysv/linux/nios2/libc.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist
@@ -2172,3 +2172,4 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
index e9ecbccb71..5c26044f5e 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
@@ -1994,6 +1994,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
index da83ea6028..a12e7b6708 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
@@ -1998,6 +1998,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist
index 4535b40d15..939978e2af 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist
@@ -2229,3 +2229,4 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist
index 65725de4f0..82f5aeed33 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist
@@ -124,6 +124,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 _Exit F
GLIBC_2.3 _IO_2_1_stderr_ D 0xe0
GLIBC_2.3 _IO_2_1_stdin_ D 0xe0
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
index bbb3c4a8e7..9e7c904d2c 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
@@ -2101,3 +2101,4 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
index e85ac2a178..f4a52b543a 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
@@ -2003,6 +2003,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
index d56931022c..8d8a4035bb 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
@@ -1909,6 +1909,7 @@ GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 __fentry__ F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
diff --git a/sysdeps/unix/sysv/linux/sh/libc.abilist b/sysdeps/unix/sysv/linux/sh/libc.abilist
index ff939a15c4..5c05555842 100644
--- a/sysdeps/unix/sysv/linux/sh/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/libc.abilist
@@ -1885,6 +1885,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
index 64fa9e10a5..4d4e972d58 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
@@ -1997,6 +1997,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
index db909d1506..96ad7b8325 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
@@ -1938,6 +1938,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
diff --git a/sysdeps/unix/sysv/linux/spawni.c b/sysdeps/unix/sysv/linux/spawni.c
index 9f3a137b5c..cb18e3d4ac 100644
--- a/sysdeps/unix/sysv/linux/spawni.c
+++ b/sysdeps/unix/sysv/linux/spawni.c
@@ -263,6 +263,11 @@ __spawni_child (void *arguments)
if (__chdir (action->action.chdir_action.path) != 0)
goto fail;
break;
+
+ case spawn_do_fchdir:
+ if (__fchdir (action->action.fchdir_action.fd) != 0)
+ goto fail;
+ break;
}
}
}
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
index 3b175f104b..52e65c5020 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
@@ -1896,6 +1896,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
index 1b57710477..dccc15bb67 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
@@ -2147,3 +2147,4 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
Samuel Thibault
2018-12-01 12:56:51 UTC
Permalink
Hello,
Post by Florian Weimer
This will need porting to Hurd (currently it results in a -Werror
failure); it should be easier than the last time.
Indeed, here is the patch to do it, which you can apply alongside.

Samuel
Adhemerval Zanella
2018-12-03 19:59:37 UTC
Permalink
Post by Florian Weimer
This will need porting to Hurd (currently it results in a -Werror
failure); it should be easier than the last time. Since the
cross-buildbot is broken right now anyway, I intend to commit this once
the generic/Linux portion is approved.
I think it is worth to mention on commit log there is an open POSIX enhancement
request [1] that aims to add similar functionality.

[1] http://austingroupbugs.net/view.php?id=1208
Post by Florian Weimer
Thanks,
Florian
-----
[BZ #17405]
* posix/Makefile (routines): Add spawn_faction_addfchdir.
* posix/Versions (GLIBC_2.29): Export
posix_spawn_file_actions_addfchdir_np.
* posix/spawn.h (posix_spawn_file_actions_addfchdir_np): Declare.
* posix/spawn_faction_destroy.c
(__posix_spawn_file_actions_destroy): Handle spawn_do_fchdir.
* posix/spawn_int.h (struct __spawn_action): Add spawn_do_fchdir
and the field action.fchdir_action.
* posix/tst-spawn-chdir.c (add_chdir): New function.
(do_test): Add do_fchdir loop. Call add_chdir.
* sysdeps/posix/spawni.c (__spawni_child): Handle spawn_do_fchdir.
* sysdeps/unix/sysv/linux/spawni.c (__spawni_child): Likewise.
* sysdeps/mach/hurd/i386/libc.abilist (GLIBC_2.29): Add
posix_spawn_file_actions_addfchdir_np.
Likewise.
Likewise.
* sysdeps/unix/sysv/linux/arm/libc.abilist (GLIBC_2.29): Likewise.
Likewise.
Likewise.
Likewise.
Likewise.
Likewise.
Likewise.
* sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
(GLIBC_2.29): Likewise.
* sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
(GLIBC_2.29): Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
(GLIBC_2.29): Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
(GLIBC_2.29): Likewise.
Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
(GLIBC_2.29): Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
(GLIBC_2.29): Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist
(GLIBC_2.29): Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist
(GLIBC_2.29): Likewise.
Likewise.
Likewise.
Likewise.
* sysdeps/unix/sysv/linux/sh/libc.abilist (GLIBC_2.29): Likewise.
Likewise.
Likewise.
Likewise.
Likewise.
diff --git a/NEWS b/NEWS
index 1098be1afb..c2fa2f7a85 100644
--- a/NEWS
+++ b/NEWS
HTM state is saved and restore lazily (the state being saved even when the
process actually does not use HTM).
-* The posix_spawn_file_actions_addchdir_np function has been added,
- enabling posix_spawn and posix_spawnp to run the new process in a
- different directory. This is a GNU extension and similar to the
- Solaris function of the same name.
+* The functions posix_spawn_file_actions_addchdir_np and
+ posix_spawn_file_actions_addfchdir_np have been added, enabling
+ posix_spawn and posix_spawnp to run the new process in a different
+ directory. These functions are GNU extensions. The function
+ posix_spawn_file_actions_addchdir_np is similar to the Solaris function of
+ the same name.
Ok.
Post by Florian Weimer
diff --git a/posix/Makefile b/posix/Makefile
index a8fb1e1839..d5a6844c88 100644
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -55,7 +55,7 @@ routines := \
pread pwrite pread64 pwrite64 \
spawn_faction_init spawn_faction_destroy spawn_faction_addclose \
spawn_faction_addopen spawn_faction_adddup2 spawn_valid_fd \
- spawn_faction_addchdir \
+ spawn_faction_addchdir spawn_faction_addfchdir \
spawnattr_init spawnattr_destroy \
spawnattr_getdefault spawnattr_setdefault \
spawnattr_getflags spawnattr_setflags \
Ok.
Post by Florian Weimer
diff --git a/posix/Versions b/posix/Versions
index 56ab921562..ad693ae9a7 100644
--- a/posix/Versions
+++ b/posix/Versions
@@ -139,6 +139,7 @@ libc {
}
GLIBC_2.29 {
posix_spawn_file_actions_addchdir_np;
+ posix_spawn_file_actions_addfchdir_np;
}
GLIBC_PRIVATE {
__libc_fork; __libc_pread; __libc_pwrite;
Ok.
Post by Florian Weimer
diff --git a/posix/spawn.h b/posix/spawn.h
index c84ee4bf72..8c40b4d28b 100644
--- a/posix/spawn.h
+++ b/posix/spawn.h
@@ -190,6 +190,12 @@ extern int posix_spawn_file_actions_adddup2 (posix_spawn_file_actions_t *
affects the subsequent file actions. */
extern int posix_spawn_file_actions_addchdir_np (posix_spawn_file_actions_t *,
const char *__path) __THROW;
+
+/* Add an action changing the directory to FD during spawn. This
+ affects the subsequent file actions. FD is not duplicated and must
+ be open when the file action is executed. */
+extern int posix_spawn_file_actions_addfchdir_np (posix_spawn_file_actions_t *,
+ int __fd) __THROW;
#endif
__END_DECLS
Ok.

As side note, should posix_spawn_file_actions_addchdir_np use __restrict for
argument definitions? It also seems __restrict usage is also missing in some
places for spawn.h.
Post by Florian Weimer
diff --git a/posix/spawn_faction_addfchdir.c b/posix/spawn_faction_addfchdir.c
new file mode 100644
index 0000000000..6f069df29e
--- /dev/null
+++ b/posix/spawn_faction_addfchdir.c
@@ -0,0 +1,46 @@
+/* Add a directory change to a file action list for posix_spawn.
+ Copyright (C) 2000-2018 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <errno.h>
+#include <spawn.h>
+#include <string.h>
+
+#include "spawn_int.h"
+
+int
+posix_spawn_file_actions_addfchdir_np (posix_spawn_file_actions_t *actions,
+ int fd)
+{
+ struct __spawn_action *rec;
+
+ /* Allocate more memory if needed. */
+ if (actions->__used == actions->__allocated
+ && __posix_spawn_file_actions_realloc (actions) != 0)
+ /* This can only mean we ran out of memory. */
+ return ENOMEM;
+
+ /* Add the new value. */
+ rec = &actions->__actions[actions->__used];
+ rec->tag = spawn_do_fchdir;
+ rec->action.fchdir_action.fd = fd;
+
+ /* Account for the new entry. */
+ ++actions->__used;
+
+ return 0;
+}
Ok.
Post by Florian Weimer
diff --git a/posix/spawn_faction_destroy.c b/posix/spawn_faction_destroy.c
index 05ca9dc13b..da172a894e 100644
--- a/posix/spawn_faction_destroy.c
+++ b/posix/spawn_faction_destroy.c
@@ -38,6 +38,7 @@ __posix_spawn_file_actions_destroy (posix_spawn_file_actions_t *file_actions)
break;
/* No cleanup required. */
break;
}
Ok.
Post by Florian Weimer
diff --git a/posix/spawn_int.h b/posix/spawn_int.h
index 9db35553c2..0d0e438ff6 100644
--- a/posix/spawn_int.h
+++ b/posix/spawn_int.h
@@ -31,6 +31,7 @@ struct __spawn_action
spawn_do_dup2,
spawn_do_open,
spawn_do_chdir,
+ spawn_do_fchdir,
} tag;
union
@@ -55,6 +56,10 @@ struct __spawn_action
{
char *path;
} chdir_action;
+ struct
+ {
+ int fd;
+ } fchdir_action;
} action;
};
Ok.
Post by Florian Weimer
diff --git a/posix/tst-spawn-chdir.c b/posix/tst-spawn-chdir.c
index dc14f2059b..8f447955c1 100644
--- a/posix/tst-spawn-chdir.c
+++ b/posix/tst-spawn-chdir.c
@@ -20,11 +20,13 @@
#include <errno.h>
#include <fcntl.h>
#include <spawn.h>
+#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
#include <support/check.h>
#include <support/support.h>
#include <support/temp_file.h>
+#include <support/test-driver.h>
#include <support/xstdio.h>
#include <support/xunistd.h>
#include <unistd.h>
@@ -64,6 +66,24 @@ get_pwd_program (void)
FAIL_EXIT1 ("cannot find pwd program");
}
+/* Adds chdir operations to ACTIONS, using PATH. If DO_FCHDIR, use
+ the open function and TMPFD to emulate chdir using fchdir. */
+static void
+add_chdir (posix_spawn_file_actions_t *actions, const char *path,
+ bool do_fchdir, int tmpfd)
+{
+ if (do_fchdir)
+ {
+ TEST_COMPARE (posix_spawn_file_actions_addopen
+ (actions, tmpfd, path, O_DIRECTORY | O_RDONLY, 0), 0);
+ TEST_COMPARE (posix_spawn_file_actions_addfchdir_np
+ (actions, tmpfd), 0);
+ TEST_COMPARE (posix_spawn_file_actions_addclose (actions, tmpfd), 0);
+ }
+ else
+ TEST_COMPARE (posix_spawn_file_actions_addchdir_np (actions, path), 0);
+}
+
static int
do_test (void)
{
@@ -87,102 +107,108 @@ do_test (void)
int iteration = 0;
for (int do_spawnp = 0; do_spawnp < 2; ++do_spawnp)
for (int do_overwrite = 0; do_overwrite < 2; ++do_overwrite)
- {
- ++iteration;
- printf ("info: iteration=%d do_spawnp=%d do_overwrite=%d\n",
- iteration, do_spawnp, do_overwrite);
+ for (int do_fchdir = 0; do_fchdir < 2; ++do_fchdir)
+ {
+ /* This subtest does not make sense for fchdir. */
+ if (do_overwrite && do_fchdir)
+ continue;
- /* The "pwd" program runs in this directory. */
- char *iteration_directory = xasprintf ("%s/%d", directory, iteration);
- add_temp_file (iteration_directory);
- xmkdir (iteration_directory, 0777);
+ ++iteration;
+ if (test_verbose > 0)
+ printf ("info: iteration=%d do_spawnp=%d do_overwrite=%d"
+ " do_fchdir=%d\n",
+ iteration, do_spawnp, do_overwrite, do_fchdir);
- /* This file receives output from "pwd". */
- char *output_file_path
- = xasprintf ("%s/output-file", iteration_directory);
- add_temp_file (output_file_path);
+ /* The "pwd" program runs in this directory. */
+ char *iteration_directory = xasprintf ("%s/%d", directory, iteration);
+ add_temp_file (iteration_directory);
+ xmkdir (iteration_directory, 0777);
- /* This subdirectory is used for chdir ordering checks. */
- char *subdir_path = xasprintf ("%s/subdir", iteration_directory);
- add_temp_file (subdir_path);
- xmkdir (subdir_path, 0777);
+ /* This file receives output from "pwd". */
+ char *output_file_path
+ = xasprintf ("%s/output-file", iteration_directory);
+ add_temp_file (output_file_path);
- /* Also used for checking the order of actions. */
- char *probe_file_path
- = xasprintf ("%s/subdir/probe-file", iteration_directory);
- add_temp_file (probe_file_path);
- TEST_COMPARE (access (probe_file_path, F_OK), -1);
- TEST_COMPARE (errno, ENOENT);
+ /* This subdirectory is used for chdir ordering checks. */
+ char *subdir_path = xasprintf ("%s/subdir", iteration_directory);
+ add_temp_file (subdir_path);
+ xmkdir (subdir_path, 0777);
- /* This symbolic link is used in a relative path with
- posix_spawn. */
- char *pwd_symlink_path
- = xasprintf ("%s/subdir/pwd-symlink", iteration_directory);
- xsymlink (get_pwd_program (), pwd_symlink_path);
- add_temp_file (pwd_symlink_path);
+ /* Also used for checking the order of actions. */
+ char *probe_file_path
+ = xasprintf ("%s/subdir/probe-file", iteration_directory);
+ add_temp_file (probe_file_path);
+ TEST_COMPARE (access (probe_file_path, F_OK), -1);
+ TEST_COMPARE (errno, ENOENT);
- posix_spawn_file_actions_t actions;
- TEST_COMPARE (posix_spawn_file_actions_init (&actions), 0);
- TEST_COMPARE (posix_spawn_file_actions_addchdir_np
- (&actions, subdir_path), 0);
- TEST_COMPARE (posix_spawn_file_actions_addopen
- (&actions, 3, /* Arbitrary unused descriptor. */
- "probe-file",
- O_WRONLY | O_CREAT | O_EXCL, 0777), 0);
- TEST_COMPARE (posix_spawn_file_actions_addclose (&actions, 3), 0);
- /* Run the actual in iteration_directory. */
- TEST_COMPARE (posix_spawn_file_actions_addchdir_np (&actions, ".."), 0);
- TEST_COMPARE (posix_spawn_file_actions_addopen
- (&actions, STDOUT_FILENO, "output-file",
- O_WRONLY | O_CREAT | O_EXCL, 0777), 0);
+ /* This symbolic link is used in a relative path with
+ posix_spawn. */
+ char *pwd_symlink_path
+ = xasprintf ("%s/subdir/pwd-symlink", iteration_directory);
+ xsymlink (get_pwd_program (), pwd_symlink_path);
+ add_temp_file (pwd_symlink_path);
- /* Check that posix_spawn_file_actions_addchdir_np made a copy
- of the path. */
- if (do_overwrite)
- subdir_path[0] = '\0';
+ posix_spawn_file_actions_t actions;
+ TEST_COMPARE (posix_spawn_file_actions_init (&actions), 0);
+ add_chdir (&actions, subdir_path, do_fchdir, 4);
+ TEST_COMPARE (posix_spawn_file_actions_addopen
+ (&actions, 3, /* Arbitrary unused descriptor. */
+ "probe-file",
+ O_WRONLY | O_CREAT | O_EXCL, 0777), 0);
+ TEST_COMPARE (posix_spawn_file_actions_addclose (&actions, 3), 0);
+ /* Run the actual in iteration_directory. */
+ add_chdir (&actions, "..", do_fchdir, 5);
+ TEST_COMPARE (posix_spawn_file_actions_addopen
+ (&actions, STDOUT_FILENO, "output-file",
+ O_WRONLY | O_CREAT | O_EXCL, 0777), 0);
- char *const argv[] = { (char *) "pwd", NULL };
- char *const envp[] = { NULL } ;
- pid_t pid;
- if (do_spawnp)
- TEST_COMPARE (posix_spawnp (&pid, "pwd", &actions,
- NULL, argv, envp), 0);
- else
- TEST_COMPARE (posix_spawn (&pid, "subdir/pwd-symlink", &actions,
- NULL, argv, envp), 0);
- TEST_VERIFY (pid > 0);
- int status;
- xwaitpid (pid, &status, 0);
- TEST_COMPARE (status, 0);
+ /* Check that posix_spawn_file_actions_addchdir_np made a copy
+ of the path. */
+ if (do_overwrite)
+ subdir_path[0] = '\0';
- /* Check that the current directory did not change. */
- {
- char *cwd = get_current_dir_name ();
- if (cwd == NULL)
- FAIL_EXIT1 ("get_current_dir_name: %m");
- TEST_COMPARE_BLOB (original_cwd, strlen (original_cwd),
- cwd, strlen (cwd));
- free (cwd);
- }
+ char *const argv[] = { (char *) "pwd", NULL };
+ char *const envp[] = { NULL } ;
+ pid_t pid;
+ if (do_spawnp)
+ TEST_COMPARE (posix_spawnp (&pid, "pwd", &actions,
+ NULL, argv, envp), 0);
+ else
+ TEST_COMPARE (posix_spawn (&pid, "subdir/pwd-symlink", &actions,
+ NULL, argv, envp), 0);
+ TEST_VERIFY (pid > 0);
+ int status;
+ xwaitpid (pid, &status, 0);
+ TEST_COMPARE (status, 0);
+ /* Check that the current directory did not change. */
+ {
+ char *cwd = get_current_dir_name ();
+ if (cwd == NULL)
+ FAIL_EXIT1 ("get_current_dir_name: %m");
+ TEST_COMPARE_BLOB (original_cwd, strlen (original_cwd),
+ cwd, strlen (cwd));
+ free (cwd);
+ }
- /* Check the output from "pwd". */
- {
- char *pwd = read_one_line (output_file_path);
- TEST_COMPARE_BLOB (iteration_directory, strlen (iteration_directory),
- pwd, strlen (pwd));
- free (pwd);
- }
- /* This file must now exist. */
- TEST_COMPARE (access (probe_file_path, F_OK), 0);
+ /* Check the output from "pwd". */
+ {
+ char *pwd = read_one_line (output_file_path);
+ TEST_COMPARE_BLOB (iteration_directory, strlen (iteration_directory),
+ pwd, strlen (pwd));
+ free (pwd);
+ }
+
+ /* This file must now exist. */
+ TEST_COMPARE (access (probe_file_path, F_OK), 0);
- TEST_COMPARE (posix_spawn_file_actions_destroy (&actions), 0);
- free (pwd_symlink_path);
- free (probe_file_path);
- free (subdir_path);
- free (output_file_path);
- }
+ TEST_COMPARE (posix_spawn_file_actions_destroy (&actions), 0);
+ free (pwd_symlink_path);
+ free (probe_file_path);
+ free (subdir_path);
+ free (output_file_path);
+ }
free (directory);
Ok.
Post by Florian Weimer
diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index d4c4a91c84..450430237d 100644
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -2040,6 +2040,7 @@ GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.29 _hurd_port_move F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
Ok.
Post by Florian Weimer
diff --git a/sysdeps/posix/spawni.c b/sysdeps/posix/spawni.c
index c42fbd590e..18ccbddc98 100644
--- a/sysdeps/posix/spawni.c
+++ b/sysdeps/posix/spawni.c
@@ -214,6 +214,11 @@ __spawni_child (void *arguments)
if (__chdir (action->action.chdir_action.path) != 0)
goto fail;
break;
+
+ if (__fchdir (action->action.fchdir_action.fd) != 0)
+ goto fail;
+ break;
}
}
}
Ok.
Post by Florian Weimer
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index e66c741d04..8763e7b618 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -2139,3 +2139,4 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
Ok.
Post by Florian Weimer
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index 8df162fe99..c7dfef32d6 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -2034,6 +2034,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
Ok.
Post by Florian Weimer
diff --git a/sysdeps/unix/sysv/linux/arm/libc.abilist b/sysdeps/unix/sysv/linux/arm/libc.abilist
index 43c804f9dc..a306d13a0f 100644
--- a/sysdeps/unix/sysv/linux/arm/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/libc.abilist
@@ -124,6 +124,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.4 _Exit F
GLIBC_2.4 _IO_2_1_stderr_ D 0xa0
GLIBC_2.4 _IO_2_1_stdin_ D 0xa0
Ok.
Post by Florian Weimer
diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
index 88b01c2e75..4285936c2c 100644
--- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
@@ -1881,6 +1881,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
Ok.
Post by Florian Weimer
diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist
index 6d02f31612..d190399192 100644
--- a/sysdeps/unix/sysv/linux/i386/libc.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libc.abilist
@@ -2046,6 +2046,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
Ok.
Post by Florian Weimer
diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
index 4249712611..918daeb348 100644
--- a/sysdeps/unix/sysv/linux/ia64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist
@@ -1915,6 +1915,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
Ok.
Post by Florian Weimer
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
index d47b808862..c9e534cf8b 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
@@ -125,6 +125,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.4 _Exit F
GLIBC_2.4 _IO_2_1_stderr_ D 0x98
GLIBC_2.4 _IO_2_1_stdin_ D 0x98
Ok.
Post by Florian Weimer
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
index d5e38308be..c8e70be876 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
@@ -1990,6 +1990,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
Ok.
Post by Florian Weimer
diff --git a/sysdeps/unix/sysv/linux/microblaze/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/libc.abilist
index 8596b84399..e356ec6d33 100644
--- a/sysdeps/unix/sysv/linux/microblaze/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/libc.abilist
@@ -2131,3 +2131,4 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
Ok.
Post by Florian Weimer
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
index 88e0f896d5..3154251d25 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
@@ -1968,6 +1968,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
Ok
Post by Florian Weimer
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
index aff7462c34..e9445adf14 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
@@ -1966,6 +1966,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
Ok.
Post by Florian Weimer
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
index 71d82444aa..4043077bc3 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
@@ -1974,6 +1974,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
Ok.
Post by Florian Weimer
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
index de6c53d293..e47cb434dc 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
@@ -1969,6 +1969,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
Ok.
Post by Florian Weimer
diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist
index e724bab9fb..024c55f29e 100644
--- a/sysdeps/unix/sysv/linux/nios2/libc.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist
@@ -2172,3 +2172,4 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
Ok.
Post by Florian Weimer
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
index e9ecbccb71..5c26044f5e 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
@@ -1994,6 +1994,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
Ok.
Post by Florian Weimer
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
index da83ea6028..a12e7b6708 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
@@ -1998,6 +1998,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
Ok.
Post by Florian Weimer
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist
index 4535b40d15..939978e2af 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist
@@ -2229,3 +2229,4 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
Ok.
Post by Florian Weimer
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist
index 65725de4f0..82f5aeed33 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist
@@ -124,6 +124,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 _Exit F
GLIBC_2.3 _IO_2_1_stderr_ D 0xe0
GLIBC_2.3 _IO_2_1_stdin_ D 0xe0
Ok.
Post by Florian Weimer
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
index bbb3c4a8e7..9e7c904d2c 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
@@ -2101,3 +2101,4 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
Ok.
Post by Florian Weimer
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
index e85ac2a178..f4a52b543a 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
@@ -2003,6 +2003,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
Ok.
Post by Florian Weimer
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
index d56931022c..8d8a4035bb 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
@@ -1909,6 +1909,7 @@ GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 __fentry__ F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
Ok.
Post by Florian Weimer
diff --git a/sysdeps/unix/sysv/linux/sh/libc.abilist b/sysdeps/unix/sysv/linux/sh/libc.abilist
index ff939a15c4..5c05555842 100644
--- a/sysdeps/unix/sysv/linux/sh/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/libc.abilist
@@ -1885,6 +1885,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
Ok.
Post by Florian Weimer
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
index 64fa9e10a5..4d4e972d58 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
@@ -1997,6 +1997,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
Ok.
Post by Florian Weimer
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
index db909d1506..96ad7b8325 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
@@ -1938,6 +1938,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
Ok.
Post by Florian Weimer
diff --git a/sysdeps/unix/sysv/linux/spawni.c b/sysdeps/unix/sysv/linux/spawni.c
index 9f3a137b5c..cb18e3d4ac 100644
--- a/sysdeps/unix/sysv/linux/spawni.c
+++ b/sysdeps/unix/sysv/linux/spawni.c
@@ -263,6 +263,11 @@ __spawni_child (void *arguments)
if (__chdir (action->action.chdir_action.path) != 0)
goto fail;
break;
+
+ if (__fchdir (action->action.fchdir_action.fd) != 0)
+ goto fail;
+ break;
}
}
}
Ok.
Post by Florian Weimer
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
index 3b175f104b..52e65c5020 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
@@ -1896,6 +1896,7 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
GLIBC_2.3 __ctype_b_loc F
GLIBC_2.3 __ctype_tolower_loc F
GLIBC_2.3 __ctype_toupper_loc F
Ok.
Post by Florian Weimer
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
index 1b57710477..dccc15bb67 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
@@ -2147,3 +2147,4 @@ GLIBC_2.28 thrd_equal F
GLIBC_2.28 thrd_sleep F
GLIBC_2.28 thrd_yield F
GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
+GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
Ok.
Florian Weimer
2018-12-03 21:25:27 UTC
Permalink
Post by Adhemerval Zanella
Post by Florian Weimer
This will need porting to Hurd (currently it results in a -Werror
failure); it should be easier than the last time. Since the
cross-buildbot is broken right now anyway, I intend to commit this once
the generic/Linux portion is approved.
I think it is worth to mention on commit log there is an open POSIX
enhancement request [1] that aims to add similar functionality.
[1] http://austingroupbugs.net/view.php?id=1208
Something like this?

Along with posix_spawn_file_actions_addchdir,
posix_spawn_file_actions_addfchdir is the subject of a change proposal
for POSIX: <http://austingroupbugs.net/view.php?id=1208>
Post by Adhemerval Zanella
As side note, should posix_spawn_file_actions_addchdir_np use __restrict for
argument definitions? It also seems __restrict usage is also missing in some
places for spawn.h.
There are other attributtes missing as well (nonnull comes to my mind).
I think we should add them in one go.

Thanks,
Florian
Florian Weimer
2018-12-05 13:21:37 UTC
Permalink
Post by Florian Weimer
Post by Adhemerval Zanella
Post by Florian Weimer
This will need porting to Hurd (currently it results in a -Werror
failure); it should be easier than the last time. Since the
cross-buildbot is broken right now anyway, I intend to commit this once
the generic/Linux portion is approved.
I think it is worth to mention on commit log there is an open POSIX
enhancement request [1] that aims to add similar functionality.
[1] http://austingroupbugs.net/view.php?id=1208
Something like this?
Along with posix_spawn_file_actions_addchdir,
posix_spawn_file_actions_addfchdir is the subject of a change proposal
for POSIX: <http://austingroupbugs.net/view.php?id=1208>
Any further comments on the patch?

Thanks,
Florian
Adhemerval Zanella
2018-12-05 13:51:19 UTC
Permalink
Post by Florian Weimer
Post by Adhemerval Zanella
Post by Florian Weimer
This will need porting to Hurd (currently it results in a -Werror
failure); it should be easier than the last time. Since the
cross-buildbot is broken right now anyway, I intend to commit this once
the generic/Linux portion is approved.
I think it is worth to mention on commit log there is an open POSIX
enhancement request [1] that aims to add similar functionality.
[1] http://austingroupbugs.net/view.php?id=1208
Something like this?
Along with posix_spawn_file_actions_addchdir,
posix_spawn_file_actions_addfchdir is the subject of a change proposal
for POSIX: <http://austingroupbugs.net/view.php?id=1208>
LGTM.
Post by Florian Weimer
Post by Adhemerval Zanella
As side note, should posix_spawn_file_actions_addchdir_np use __restrict for
argument definitions? It also seems __restrict usage is also missing in some
places for spawn.h.
There are other attributtes missing as well (nonnull comes to my mind).
I think we should add them in one go.
We can fix these in a subsequent patch.

Loading...