diff options
author | Ludovic Courtès <ludo@gnu.org> | 2020-09-19 14:11:47 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2020-09-19 17:28:47 +0200 |
commit | d845e3af7c410d70d240590d80ed31b8f169c266 (patch) | |
tree | 0222aae5386f553f237fd06d1d01ae246c42cee5 /guix/utils.scm | |
parent | a08cb3ca951cf9ebdea5258e6c34e2664877c363 (diff) | |
download | guix-patches-d845e3af7c410d70d240590d80ed31b8f169c266.tar guix-patches-d845e3af7c410d70d240590d80ed31b8f169c266.tar.gz |
utils: Add 'call-with-temporary-output-file'.
* guix/utils.scm: Re-export 'call-with-temporary-output-file'.
(call-with-temporary-output-file): Move to...
* guix/build/utils.scm (call-with-temporary-output-file): ... here.
Diffstat (limited to 'guix/utils.scm')
-rw-r--r-- | guix/utils.scm | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/guix/utils.scm b/guix/utils.scm index b816c355dc..7cc321205e 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -35,7 +35,9 @@ #:use-module (rnrs io ports) ;need 'port-position' etc. #:use-module ((rnrs bytevectors) #:select (bytevector-u8-set!)) #:use-module (guix memoization) - #:use-module ((guix build utils) #:select (dump-port mkdir-p delete-file-recursively)) + #:use-module ((guix build utils) + #:select (dump-port mkdir-p delete-file-recursively + call-with-temporary-output-file)) #:use-module ((guix build syscalls) #:select (mkdtemp! fdatasync)) #:use-module (guix diagnostics) ;<location>, &error-location, etc. #:use-module (ice-9 format) @@ -59,7 +61,9 @@ &fix-hint fix-hint? - condition-fix-hint) + condition-fix-hint + + call-with-temporary-output-file) #:export (strip-keyword-arguments default-keyword-arguments substitute-keyword-arguments @@ -94,7 +98,6 @@ tarball-sans-extension compressed-file? switch-symlinks - call-with-temporary-output-file call-with-temporary-directory with-atomic-file-output @@ -677,22 +680,6 @@ REPLACEMENT." (substring str start index) pieces)))))))) -(define (call-with-temporary-output-file proc) - "Call PROC with a name of a temporary file and open output port to that -file; close the file and delete it when leaving the dynamic extent of this -call." - (let* ((directory (or (getenv "TMPDIR") "/tmp")) - (template (string-append directory "/guix-file.XXXXXX")) - (out (mkstemp! template))) - (dynamic-wind - (lambda () - #t) - (lambda () - (proc template out)) - (lambda () - (false-if-exception (close out)) - (false-if-exception (delete-file template)))))) - (define (call-with-temporary-directory proc) "Call PROC with a name of a temporary directory; close the directory and delete it when leaving the dynamic extent of this call." |