diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-09-30 03:50:47 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-09-30 03:50:47 -0400 |
| commit | 856d318a9f543d8a61fcf61caae7d07102586802 (patch) | |
| tree | 10bd99500c027bbd472253f6cc34f8b1b516d4a1 /libguile/simpos.c | |
| parent | f7582f9807d9a10fba86f54c4aeaa7444c51a315 (diff) | |
| parent | 3157d455039f137ca5dfa8b9fbc4a3404ce00606 (diff) | |
| download | guile-856d318a9f543d8a61fcf61caae7d07102586802.tar.gz | |
Merge branch 'stable-2.0'
Conflicts:
benchmark-suite/benchmarks/ports.bm
libguile/async.h
libguile/bytevectors.c
libguile/foreign.c
libguile/gsubr.c
libguile/srfi-1.c
libguile/vm-engine.h
libguile/vm-i-scheme.c
module/Makefile.am
module/language/tree-il/analyze.scm
module/language/tree-il/peval.scm
module/scripts/compile.scm
module/scripts/disassemble.scm
test-suite/tests/asm-to-bytecode.test
test-suite/tests/peval.test
test-suite/tests/rdelim.test
Diffstat (limited to 'libguile/simpos.c')
| -rw-r--r-- | libguile/simpos.c | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/libguile/simpos.c b/libguile/simpos.c index a657a8f09..70058285a 100644 --- a/libguile/simpos.c +++ b/libguile/simpos.c @@ -45,6 +45,10 @@ # include <sys/wait.h> #endif +#ifdef __MINGW32__ +# include <process.h> /* for spawnvp and friends */ +#endif + #include "posix.h" @@ -86,8 +90,6 @@ SCM_DEFINE (scm_system, "system", 0, 1, 0, #ifdef HAVE_SYSTEM -#ifdef HAVE_WAITPID - SCM_DEFINE (scm_system_star, "system*", 0, 0, 1, (SCM args), @@ -115,11 +117,18 @@ SCM_DEFINE (scm_system_star, "system*", 0, 0, 1, if (scm_is_pair (args)) { SCM oldint; - SCM oldquit; SCM sig_ign; SCM sigint; + /* SIGQUIT is undefined on MS-Windows. */ +#ifdef SIGQUIT + SCM oldquit; SCM sigquit; +#endif +#ifdef HAVE_FORK int pid; +#else + int status; +#endif char **execargv; /* allocate before fork */ @@ -128,10 +137,13 @@ SCM_DEFINE (scm_system_star, "system*", 0, 0, 1, /* make sure the child can't kill us (as per normal system call) */ sig_ign = scm_from_ulong ((unsigned long) SIG_IGN); sigint = scm_from_int (SIGINT); - sigquit = scm_from_int (SIGQUIT); oldint = scm_sigaction (sigint, sig_ign, SCM_UNDEFINED); +#ifdef SIGQUIT + sigquit = scm_from_int (SIGQUIT); oldquit = scm_sigaction (sigquit, sig_ign, SCM_UNDEFINED); - +#endif + +#ifdef HAVE_FORK pid = fork (); if (pid == 0) { @@ -164,12 +176,20 @@ SCM_DEFINE (scm_system_star, "system*", 0, 0, 1, return scm_from_int (status); } +#else /* !HAVE_FORK */ + status = spawnvp (P_WAIT, execargv[0], (const char * const *)execargv); + scm_sigaction (sigint, SCM_CAR (oldint), SCM_CDR (oldint)); +#ifdef SIGQUIT + scm_sigaction (sigquit, SCM_CAR (oldquit), SCM_CDR (oldquit)); +#endif + + return scm_from_int (status); +#endif /* !HAVE_FORK */ } else SCM_WRONG_TYPE_ARG (1, args); } #undef FUNC_NAME -#endif /* HAVE_WAITPID */ #endif /* HAVE_SYSTEM */ |