nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ui: Report file names in 'system-error' exceptions from 'execlp'. 

Fixes <https://bugs.gnu.org/33755>.

* guix/ui.scm (apply-formals): New macro.
(execlp): New error-reporting wrapper.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Timothy Sample 2018-12-16 23:12:13 -05:00 committed by Ludovic Courtès
parent 83d4da1211
commit 6616a35202
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
guix/ui.scm
View File

@ -502,14 +502,19 @@ General help using GNU software: <http://www.gnu.org/gethelp/>"))
(list (strerror (car errno)) file)
(list errno))))
(define-syntax-rule (error-reporting-wrapper proc (args ...) file)
(define-syntax apply-formals
(syntax-rules ()
((_ proc (args ...)) (proc args ...))
((_ proc (arg1 args ... . rest)) (apply proc arg1 args ... rest))))
(define-syntax-rule (error-reporting-wrapper proc formals file)
"Wrap PROC such that its 'system-error' exceptions are augmented to mention
FILE."
(let ((real-proc (@ (guile) proc)))
(lambda (args ...)
(lambda formals
(catch 'system-error
(lambda ()
(real-proc args ...))
(apply-formals real-proc formals))
(augmented-system-error-handler file)))))
(set! symlink
@ -528,6 +533,8 @@ FILE."
(set! delete-file
(error-reporting-wrapper delete-file (file) file))
(set! execlp
(error-reporting-wrapper execlp (filename . args) filename))
(define (make-regexp* regexp . flags)
"Like 'make-regexp' but error out if REGEXP is invalid, reporting the error