From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.lisp.guile.devel Subject: Make system* available on MS-Windows Date: Mon, 30 Jun 2014 18:07:18 +0300 Message-ID: <831tu65tcp.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1404140877 22794 80.91.229.3 (30 Jun 2014 15:07:57 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 30 Jun 2014 15:07:57 +0000 (UTC) Cc: Mark H Weaver , guile-devel@gnu.org To: ludo@gnu.org (Ludovic =?iso-8859-1?Q?Court=E8s?=) Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Mon Jun 30 17:07:50 2014 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1X1dBM-0001MH-B6 for guile-devel@m.gmane.org; Mon, 30 Jun 2014 17:07:48 +0200 Original-Received: from localhost ([::1]:34907 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1dBL-000541-R7 for guile-devel@m.gmane.org; Mon, 30 Jun 2014 11:07:47 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52634) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1dB7-0004u0-Ia for guile-devel@gnu.org; Mon, 30 Jun 2014 11:07:41 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X1dAz-00075z-4s for guile-devel@gnu.org; Mon, 30 Jun 2014 11:07:33 -0400 Original-Received: from mtaout26.012.net.il ([80.179.55.182]:38101) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1dAy-00075g-SB; Mon, 30 Jun 2014 11:07:25 -0400 Original-Received: from conversion-daemon.mtaout26.012.net.il by mtaout26.012.net.il (HyperSendmail v2007.08) id <0N7Z00B00LIPR100@mtaout26.012.net.il>; Mon, 30 Jun 2014 18:03:21 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout26.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N7Z00864LTLWN40@mtaout26.012.net.il>; Mon, 30 Jun 2014 18:03:21 +0300 (IDT) X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.182 X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Original-Sender: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.devel:17255 Archived-At: 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 #endif +#ifdef __MINGW32__ +#include +#endif + #include "posix.h" @@ -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 */