Make system* available on MS-Windows

Make system* available on MS-Windows

[Eli Zaretskii]

This function was disabled on Windows because its implementation used
'fork' and 'waitpid'.  The patch below makes system* available on
Windows:

--- libguile/simpos.c~0	2014-02-28 23:01:27 +0200
+++ libguile/simpos.c	2014-06-30 13:55:11 +0300
@@ -45,6 +45,10 @@
 # include <sys/wait.h>
 #endif
 
+#ifdef __MINGW32__
+#include <process.h>
+#endif
+
 #include "posix.h"
 
 \f
@@ -86,8 +90,6 @@ SCM_DEFINE (scm_system, "system", 0, 1,
 
 
 #ifdef HAVE_SYSTEM
-#ifdef HAVE_WAITPID
-
 
 SCM_DEFINE (scm_system_star, "system*", 0, 0, 1,
            (SCM args),
@@ -115,11 +117,17 @@ SCM_DEFINE (scm_system_star, "system*",
   if (scm_is_pair (args))
     {
       SCM oldint;
-      SCM oldquit;
       SCM sig_ign;
       SCM sigint;
+#ifdef SIGQUIT
+      SCM oldquit;
       SCM sigquit;
+#endif
+#ifdef HAVE_FORK
       int pid;
+#else
+      int status;
+#endif
       char **execargv;
 
       /* allocate before fork */
@@ -128,10 +136,13 @@ SCM_DEFINE (scm_system_star, "system*",
       /* 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 +175,20 @@ SCM_DEFINE (scm_system_star, "system*",
 
           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 */
 
 

Re: Make system* available on MS-Windows

[Ludovic Courtès]

Eli Zaretskii <eliz@gnu.org> skribis:

> This function was disabled on Windows because its implementation used
> 'fork' and 'waitpid'.  The patch below makes system* available on
> Windows:
>
> --- libguile/simpos.c~0	2014-02-28 23:01:27 +0200
> +++ libguile/simpos.c	2014-06-30 13:55:11 +0300
> @@ -45,6 +45,10 @@
>  # include <sys/wait.h>
>  #endif
>  
> +#ifdef __MINGW32__
> +#include <process.h>

Please add a margin comment on this line reading “for waitpid” or
something like that.  Also leave a space after the sharp sign.

> @@ -115,11 +117,17 @@ SCM_DEFINE (scm_system_star, "system*",
>    if (scm_is_pair (args))
>      {
>        SCM oldint;
> -      SCM oldquit;
>        SCM sig_ign;
>        SCM sigint;
> +#ifdef SIGQUIT

Please add a margin comment saying that SIGQUIT is undefined on MinGW.

OK to push with these changes, thank you!

Ludo’.

Re: Make system* available on MS-Windows

[Eli Zaretskii]

> From: ludo@gnu.org (Ludovic Courtès)
> Cc: Mark H Weaver <mhw@netris.org>,  guile-devel@gnu.org
> Date: Wed, 02 Jul 2014 11:55:56 +0200
> 
> Eli Zaretskii <eliz@gnu.org> skribis:
> 
> > This function was disabled on Windows because its implementation used
> > 'fork' and 'waitpid'.  The patch below makes system* available on
> > Windows:
> >
> > --- libguile/simpos.c~0	2014-02-28 23:01:27 +0200
> > +++ libguile/simpos.c	2014-06-30 13:55:11 +0300
> > @@ -45,6 +45,10 @@
> >  # include <sys/wait.h>
> >  #endif
> >  
> > +#ifdef __MINGW32__
> > +#include <process.h>
> 
> Please add a margin comment on this line reading “for waitpid” or
> something like that.  Also leave a space after the sharp sign.
> 
> > @@ -115,11 +117,17 @@ SCM_DEFINE (scm_system_star, "system*",
> >    if (scm_is_pair (args))
> >      {
> >        SCM oldint;
> > -      SCM oldquit;
> >        SCM sig_ign;
> >        SCM sigint;
> > +#ifdef SIGQUIT
> 
> Please add a margin comment saying that SIGQUIT is undefined on MinGW.
> 
> OK to push with these changes, thank you!

Pushed.