Mercurial > gnulib
changeset 39883:cd549182ef0e
sh-filename: New module.
* m4/sh-filename.m4: New file.
* modules/sh-filename: New file.
* lib/spawni.c (_PATH_BSHELL): Use BOURNE_SHELL instead of hardcoding
"/bin/sh".
* tests/test-posix_spawn1.c (main): Likewise.
* tests/test-posix_spawn2.c (main): Likewise.
* lib/javacomp.c (compile_using_envjavac, is_envjavac_gcj,
is_envjavac_gcj43): Likewise.
* lib/javaexec.c (execute_java_class): Likewise.
* modules/posix_spawn-internal (Depends-on): Add sh-filename.
* modules/posix_spawnp-tests (Depends-on): Likewise.
* modules/javacomp (Depends-on): Likewise.
* modules/javaexec (Depends-on): Likewise.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Fri, 05 Oct 2018 01:38:46 +0200 |
| parents | 423dd81f09f4 |
| children | d8ad6b800760 |
| files | ChangeLog lib/javacomp.c lib/javaexec.c lib/spawni.c m4/sh-filename.m4 modules/javacomp modules/javaexec modules/posix_spawn-internal modules/posix_spawnp-tests modules/sh-filename tests/test-posix_spawn1.c tests/test-posix_spawn2.c |
| diffstat | 12 files changed, 74 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Oct 05 01:16:56 2018 +0200 +++ b/ChangeLog Fri Oct 05 01:38:46 2018 +0200 @@ -1,3 +1,20 @@ +2018-10-04 Bruno Haible <bruno@clisp.org> + + sh-filename: New module. + * m4/sh-filename.m4: New file. + * modules/sh-filename: New file. + * lib/spawni.c (_PATH_BSHELL): Use BOURNE_SHELL instead of hardcoding + "/bin/sh". + * tests/test-posix_spawn1.c (main): Likewise. + * tests/test-posix_spawn2.c (main): Likewise. + * lib/javacomp.c (compile_using_envjavac, is_envjavac_gcj, + is_envjavac_gcj43): Likewise. + * lib/javaexec.c (execute_java_class): Likewise. + * modules/posix_spawn-internal (Depends-on): Add sh-filename. + * modules/posix_spawnp-tests (Depends-on): Likewise. + * modules/javacomp (Depends-on): Likewise. + * modules/javaexec (Depends-on): Likewise. + 2018-10-04 Bruno Haible <bruno@clisp.org> spawn-pipe tests: Avoid test failure on native Windows.
--- a/lib/javacomp.c Fri Oct 05 01:16:56 2018 +0200 +++ b/lib/javacomp.c Fri Oct 05 01:38:46 2018 +0200 @@ -339,11 +339,11 @@ if (verbose) printf ("%s\n", command); - argv[0] = "/bin/sh"; + argv[0] = BOURNE_SHELL; argv[1] = "-c"; argv[2] = command; argv[3] = NULL; - exitstatus = execute (javac, "/bin/sh", argv, false, false, false, + exitstatus = execute (javac, BOURNE_SHELL, argv, false, false, false, null_stderr, true, true, NULL); err = (exitstatus != 0); @@ -656,11 +656,11 @@ abort (); /* Call $JAVAC --version 2>/dev/null. */ - argv[0] = "/bin/sh"; + argv[0] = BOURNE_SHELL; argv[1] = "-c"; argv[2] = command; argv[3] = NULL; - child = create_pipe_in (javac, "/bin/sh", argv, DEV_NULL, true, true, + child = create_pipe_in (javac, BOURNE_SHELL, argv, DEV_NULL, true, true, false, fd); if (child == -1) goto failed; @@ -738,11 +738,11 @@ abort (); /* Call $JAVAC --version 2>/dev/null. */ - argv[0] = "/bin/sh"; + argv[0] = BOURNE_SHELL; argv[1] = "-c"; argv[2] = command; argv[3] = NULL; - child = create_pipe_in (javac, "/bin/sh", argv, DEV_NULL, true, true, + child = create_pipe_in (javac, BOURNE_SHELL, argv, DEV_NULL, true, true, false, fd); if (child == -1) goto failed;
--- a/lib/javaexec.c Fri Oct 05 01:16:56 2018 +0200 +++ b/lib/javaexec.c Fri Oct 05 01:38:46 2018 +0200 @@ -172,11 +172,11 @@ if (verbose) printf ("%s\n", command); - argv[0] = "/bin/sh"; + argv[0] = BOURNE_SHELL; argv[1] = "-c"; argv[2] = command; argv[3] = NULL; - err = executer (java, "/bin/sh", argv, private_data); + err = executer (java, BOURNE_SHELL, argv, private_data); freea (command);
--- a/lib/spawni.c Fri Oct 05 01:16:56 2018 +0200 +++ b/lib/spawni.c Fri Oct 05 01:38:46 2018 +0200 @@ -32,7 +32,7 @@ #if _LIBC || HAVE_PATHS_H # include <paths.h> #else -# define _PATH_BSHELL "/bin/sh" +# define _PATH_BSHELL BOURNE_SHELL #endif #include <signal.h>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/m4/sh-filename.m4 Fri Oct 05 01:38:46 2018 +0200 @@ -0,0 +1,20 @@ +# sh-filename.m4 serial 1 +dnl Copyright (C) 2018 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Bruno Haible. + +AC_DEFUN([gl_SH_FILENAME], +[ + AH_VERBATIM([SH_FILENAME], +[/* File name of the Bourne shell. */ +#if defined __CYGWIN__ +/* Omit the directory part because for 32-bit Cygwin programs in a + 64-bit Cygwin environment, the Cygwin mounts are not visible. */ +# define BOURNE_SHELL "sh" +#else +# define BOURNE_SHELL "/bin/sh" +#endif]) +])
--- a/modules/javacomp Fri Oct 05 01:16:56 2018 +0200 +++ b/modules/javacomp Fri Oct 05 01:38:46 2018 +0200 @@ -28,6 +28,7 @@ c-strstr gettext-h javacomp-script +sh-filename configure.ac:
--- a/modules/javaexec Fri Oct 05 01:16:56 2018 +0200 +++ b/modules/javaexec Fri Oct 05 01:38:46 2018 +0200 @@ -17,6 +17,7 @@ error gettext-h javaexec-script +sh-filename configure.ac:
--- a/modules/posix_spawn-internal Fri Oct 05 01:16:56 2018 +0200 +++ b/modules/posix_spawn-internal Fri Oct 05 01:38:46 2018 +0200 @@ -12,6 +12,7 @@ dup2 errno open +sh-filename strchrnul configure.ac:
--- a/modules/posix_spawnp-tests Fri Oct 05 01:16:56 2018 +0200 +++ b/modules/posix_spawnp-tests Fri Oct 05 01:38:46 2018 +0200 @@ -20,6 +20,7 @@ sys_wait dup environ +sh-filename sigprocmask configure.ac:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/sh-filename Fri Oct 05 01:38:46 2018 +0200 @@ -0,0 +1,20 @@ +Description: +Provide BOURNE_SHELL, the file name of the standard Bourne shell. + +Files: +m4/sh-filename.m4 + +Depends-on: + +configure.ac: +gl_SH_FILENAME + +Makefile.am: + +Include: + +License: +LGPLv2+ + +Maintainer: +all
--- a/tests/test-posix_spawn1.c Fri Oct 05 01:16:56 2018 +0200 +++ b/tests/test-posix_spawn1.c Fri Oct 05 01:38:46 2018 +0200 @@ -73,7 +73,7 @@ int main () { - char *argv[3] = { (char *) "/bin/sh", (char *) CHILD_PROGRAM_FILENAME, NULL }; + char *argv[3] = { (char *) BOURNE_SHELL, (char *) CHILD_PROGRAM_FILENAME, NULL }; int ifd[2]; sigset_t blocked_signals; sigset_t fatal_signal_set; @@ -113,7 +113,7 @@ || (attrs_allocated = true, (err = posix_spawnattr_setsigmask (&attrs, &blocked_signals)) != 0 || (err = posix_spawnattr_setflags (&attrs, POSIX_SPAWN_SETSIGMASK)) != 0) - || (err = posix_spawnp (&child, "/bin/sh", &actions, &attrs, argv, environ)) != 0)) + || (err = posix_spawnp (&child, BOURNE_SHELL, &actions, &attrs, argv, environ)) != 0)) { if (actions_allocated) posix_spawn_file_actions_destroy (&actions);
--- a/tests/test-posix_spawn2.c Fri Oct 05 01:16:56 2018 +0200 +++ b/tests/test-posix_spawn2.c Fri Oct 05 01:38:46 2018 +0200 @@ -51,7 +51,7 @@ int main () { - char *argv[3] = { (char *) "/bin/sh", (char *) CHILD_PROGRAM_FILENAME, NULL }; + char *argv[3] = { (char *) BOURNE_SHELL, (char *) CHILD_PROGRAM_FILENAME, NULL }; int ofd[2]; sigset_t blocked_signals; sigset_t fatal_signal_set; @@ -90,7 +90,7 @@ || (attrs_allocated = true, (err = posix_spawnattr_setsigmask (&attrs, &blocked_signals)) != 0 || (err = posix_spawnattr_setflags (&attrs, POSIX_SPAWN_SETSIGMASK)) != 0) - || (err = posix_spawnp (&child, "/bin/sh", &actions, &attrs, argv, environ)) != 0)) + || (err = posix_spawnp (&child, BOURNE_SHELL, &actions, &attrs, argv, environ)) != 0)) { if (actions_allocated) posix_spawn_file_actions_destroy (&actions);