We want to allow builds in chroots that lack /bin/sh. Thus, system(3) and popen(3) need to be tweaked to use the right shell. For the bootstrap glibc, we just use whatever `sh' can be found in $PATH. The final glibc instead uses the hard-coded absolute file name of `bash'. In addition, status should be initialized to 0 and not -1. diff --git a/libio/iopopen.c b/libio/iopopen.c index ebc381ed7c..e0d3ed1bc3 100644 --- a/libio/iopopen.c +++ b/libio/iopopen.c @@ -85,7 +85,7 @@ spawn_process (posix_spawn_file_actions_t *fa, FILE *fp, const char *command, return false; } - if (__posix_spawn (&((_IO_proc_file *) fp)->pid, _PATH_BSHELL, fa, 0, + if (__posix_spawnp (&((_IO_proc_file *) fp)->pid, "sh", fa, 0, (char *const[]){ (char*) "sh", (char*) "-c", (char *) command, NULL }, __environ) != 0) return false; diff --git a/sysdeps/posix/system.c b/sysdeps/posix/system.c index a03f478fc7..94da6facf3 100644 --- a/sysdeps/posix/system.c +++ b/sysdeps/posix/system.c @@ -101,7 +101,7 @@ cancel_handler (void *arg) static int do_system (const char *line) { - int status = -1; + int status = 0; int ret; pid_t pid; struct sigaction sa; @@ -145,7 +145,7 @@ do_system (const char *line) __posix_spawnattr_setflags (&spawn_attr, POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK); - ret = __posix_spawn (&pid, SHELL_PATH, 0, &spawn_attr, + ret = __posix_spawnp (&pid, SHELL_NAME, 0, &spawn_attr, (char *const[]){ (char *) SHELL_NAME, (char *) "-c", (char *) line, NULL }, --- a/include/spawn.h +++ b/include/spawn.h @@ -5,6 +5,9 @@ __typeof (posix_spawn) __posix_spawn; libc_hidden_proto (__posix_spawn) +__typeof (posix_spawnp) __posix_spawnp; +libc_hidden_proto (__posix_spawnp) + __typeof (posix_spawn_file_actions_addclose) __posix_spawn_file_actions_addclose attribute_hidden; --- a/posix/spawnp.c +++ b/posix/spawnp.c @@ -31,6 +31,7 @@ __posix_spawnp (pid_t *pid, const char *file, SPAWN_XFLAGS_USE_PATH); } versioned_symbol (libc, __posix_spawnp, posix_spawnp, GLIBC_2_15); +libc_hidden_def (__posix_spawnp) #if SHLIB_COMPAT (libc, GLIBC_2_2, GLIBC_2_15) 80a35b0b8be745cb2a3'>gnu/packages/language.scm
AgeCommit message (Expand)Author
2023-11-23gnu: praat: Update to 6.4....* gnu/packages/language.scm (praat): Update to 6.4. Change-Id: I6138e87781e007d5798a908a4b5ae5c0c3338b05 Signed-off-by: Christopher Baines <mail@cbaines.net> Preston M. Firestone
2023-08-15gnu: nimf: Build with librsvg-for-system....* gnu/packages/language.scm (nimf)[inputs]: Replace librsvg with librsvg-for-system. Efraim Flashner
2023-08-07gnu: praat: Honor #:tests?....* gnu/packages/language.scm (praat)[arguments]: Check #:tests? in 'check phase. Ludovic Courtès
2023-08-07gnu: praat: Update style....* gnu/packages/language.scm (praat): [arguments]: Use g-exps. [#:phases]: Drop trailing #t. [inputs]: Use new format. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Preston M. Firestone
2023-08-07gnu: praat: Add tests to praat....* gnu/packages/language.scm (praat): Run non-graphical tests. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Preston M. Firestone
2023-08-07gnu: praat: Update to 6.3.10....* gnu/packages/language.scm (praat): Update to 6.3.10. [make-flags]: Use (cc-for-target). Signed-off-by: Ludovic Courtès <ludo@gnu.org> Preston M. Firestone
2023-08-07gnu: praat: Update to 6.1.49....Version 6.1.30 of praat can't be built with GCC. Version 6.1.49 patches this. See https://github.com/praat/praat/pull/1622 for more information. -- >8 -- * gnu/packages/language.scm (praat): Update to 6.1.49. [inputs]: Replace gtk+-2 with gtk+. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Preston M. Firestone