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=668ba7c95594b8294e46027dfade8fa0adb25614 The branch, stable-2.0 has been updated via 668ba7c95594b8294e46027dfade8fa0adb25614 (commit) from b9d724982d01899ca09b02f889e7207e06a43803 (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 668ba7c95594b8294e46027dfade8fa0adb25614 Author: Ludovic Courtès <l...@gnu.org> Date: Wed Dec 19 23:15:45 2012 +0100 Change `system*' to not leave dangling processes behind. Fixes <http://bugs.gnu.org/13166>. * libguile/simpos.c (scm_system_star): In the child, call `_exit' instead of `SCM_SYSERROR' when `execvp' fails. * test-suite/tests/posix.test ("system*"): New test prefix. ----------------------------------------------------------------------- Summary of changes: libguile/simpos.c | 22 +++++++++++++++------- test-suite/tests/posix.test | 15 ++++++++++++++- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/libguile/simpos.c b/libguile/simpos.c index 5c8fe96..8859d4f 100644 --- a/libguile/simpos.c +++ b/libguile/simpos.c @@ -1,6 +1,6 @@ -/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2003, 2004, 2009, 2010 Free Software - * Foundation, Inc. - * +/* Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2003, 2004, 2009, + * 2010, 2012 Free Software Foundation, Inc. + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License * as published by the Free Software Foundation; either version 3 of @@ -26,6 +26,7 @@ #include <errno.h> #include <signal.h> /* for SIG constants */ #include <stdlib.h> /* for getenv */ +#include <stdio.h> #include "libguile/_scm.h" @@ -137,10 +138,17 @@ SCM_DEFINE (scm_system_star, "system*", 0, 0, 1, if (pid == 0) { /* child */ - execvp (execargv[0], execargv); - SCM_SYSERROR; - /* not reached. */ - return SCM_BOOL_F; + execvp (execargv[0], execargv); + + /* Something went wrong. */ + fprintf (stderr, "In execvp of %s: %s\n", + execargv[0], strerror (errno)); + + /* Exit directly instead of throwing, because otherwise this + process may keep on running. Use exit status 127, like + shells in this case, as per POSIX + <http://pubs.opengroup.org/onlinepubs/007904875/utilities/xcu_chap02.html#tag_02_09_01_01>. */ + _exit (127); } else { diff --git a/test-suite/tests/posix.test b/test-suite/tests/posix.test index 9679042..ebfb20e 100644 --- a/test-suite/tests/posix.test +++ b/test-suite/tests/posix.test @@ -1,6 +1,6 @@ ;;;; posix.test --- Test suite for Guile POSIX functions. -*- scheme -*- ;;;; -;;;; Copyright 2003, 2004, 2006, 2007, 2010 Free Software Foundation, Inc. +;;;; Copyright 2003, 2004, 2006, 2007, 2010, 2012 Free Software Foundation, Inc. ;;;; ;;;; This library is free software; you can redistribute it and/or ;;;; modify it under the terms of the GNU Lesser General Public @@ -198,3 +198,16 @@ (setaffinity (getpid) mask) (equal? mask (getaffinity (getpid)))) (throw 'unresolved)))) + +;; +;; system* +;; + +(with-test-prefix "system*" + + (pass-if "http://bugs.gnu.org/13166"; + ;; With Guile up to 2.0.7 included, the child process launched by + ;; `system*' would remain alive after an `execvp' failure. + (let ((me (getpid))) + (and (not (zero? (pk (system* "something-that-does-not-exist")))) + (= me (getpid)))))) hooks/post-receive -- GNU Guile
