diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-12-22 15:26:30 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-12-22 15:26:30 +0100 |
| commit | f30830b2e67d973f2363903dbe5b27269da1901a (patch) | |
| tree | 851a3a361cde2e083c418c54a1932bd57096c5a0 /guix/utils.scm | |
| parent | 34f1838f04c7c359da8dbba86817499630ce7f01 (diff) | |
| parent | 25ec3684e3529fae290d389ba11755c7e7c016ea (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/utils.scm')
| -rw-r--r-- | guix/utils.scm | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/guix/utils.scm b/guix/utils.scm index 9bad06d52f..ed1a418cca 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -731,17 +731,19 @@ environment variable name like \"XDG_CONFIG_HOME\"; SUFFIX is a suffix like ;;; Source location. ;;; -(define (absolute-dirname file) - "Return the absolute name of the directory containing FILE, or #f upon +(define absolute-dirname + ;; Memoize to avoid repeated 'stat' storms from 'search-path'. + (mlambda (file) + "Return the absolute name of the directory containing FILE, or #f upon failure." - (match (search-path %load-path file) - (#f #f) - ((? string? file) - ;; If there are relative names in %LOAD-PATH, FILE can be relative and - ;; needs to be canonicalized. - (if (string-prefix? "/" file) - (dirname file) - (canonicalize-path (dirname file)))))) + (match (search-path %load-path file) + (#f #f) + ((? string? file) + ;; If there are relative names in %LOAD-PATH, FILE can be relative and + ;; needs to be canonicalized. + (if (string-prefix? "/" file) + (dirname file) + (canonicalize-path (dirname file))))))) (define-syntax current-source-directory (lambda (s) |