[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.11-42-g4698a
From: |
Eli Zaretskii |
Subject: |
[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.11-42-g4698a11 |
Date: |
Wed, 02 Jul 2014 15:39:38 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".
http://git.savannah.gnu.org/cgit/guile.git/commit/?id=4698a11cbdb057953cf4e02126c701d875cc1f42
The branch, stable-2.0 has been updated
via 4698a11cbdb057953cf4e02126c701d875cc1f42 (commit)
from 0d77e062dc70ed10cfcedf1e6080287f8be20b1b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4698a11cbdb057953cf4e02126c701d875cc1f42
Author: Eli Zaretskii <address@hidden>
Date: Wed Jul 2 18:38:28 2014 +0300
Make 'system*' available on MS-Windows.
* libguile/simpos.c (scm_system_star) [!HAVE_FORK]: An
implementation of 'system*' for MS-Windows, which doesn't have
'fork', but can use 'spawnvp' in this case.
-----------------------------------------------------------------------
Summary of changes:
libguile/simpos.c | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/libguile/simpos.c b/libguile/simpos.c
index 6b3f51b..c0fbd79 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 */
hooks/post-receive
--
GNU Guile
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.11-42-g4698a11,
Eli Zaretskii <=