diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-05-07 16:33:01 +0200 |
|---|---|---|
| committer | Mathieu Lirzin <mthl@gnu.org> | 2016-05-07 23:38:53 +0200 |
| commit | 45b062490a9924bcc6d582d10061244ced73f3f8 (patch) | |
| tree | 02a13d9ddda97ee57a8c7284e456f10a93b6fc7b /src/mcron/base.scm | |
| parent | 0d91ec1b974679596631da17539429a46ca4cad3 (diff) | |
| download | mcron-45b062490a9924bcc6d582d10061244ced73f3f8.tar.gz mcron-45b062490a9924bcc6d582d10061244ced73f3f8.tar.bz2 mcron-45b062490a9924bcc6d582d10061244ced73f3f8.zip | |
base: run-jobs: Ensure that the child process always terminates.
* src/mcron/base.scm (run-jobs): Use 'dynamic-wind' instead of 'begin'.
Diffstat (limited to 'src/mcron/base.scm')
| -rw-r--r-- | src/mcron/base.scm | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/mcron/base.scm b/src/mcron/base.scm index 7094dbc..aae5fe5 100644 --- a/src/mcron/base.scm +++ b/src/mcron/base.scm @@ -1,3 +1,4 @@ +;; Copyright (C) 2016 Ludovic Courtès ;; Copyright (C) 2015, 2016 Mathieu Lirzin ;; Copyright (C) 2003 Dale Mellor ;; @@ -198,13 +199,16 @@ (for-each (lambda (job) (if (eqv? (primitive-fork) 0) - (begin - (setgid (passwd:gid (job:user job))) - (setuid (passwd:uid (job:user job))) - (chdir (passwd:dir (job:user job))) - (modify-environment (job:environment job) (job:user job)) - ((job:action job)) - (primitive-exit 0)) + (dynamic-wind + (const #t) + (lambda () + (setgid (passwd:gid (job:user job))) + (setuid (passwd:uid (job:user job))) + (chdir (passwd:dir (job:user job))) + (modify-environment (job:environment job) (job:user job)) + ((job:action job))) + (lambda () + (primitive-exit 0))) (begin (set! number-children (+ number-children 1)) (job:next-time-set! job ((job:next-time-function job) |