[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#54180] [PATCH 06/12] home: symlink-manager: Avoid extra 'lstat' cal
From: |
Maxime Devos |
Subject: |
[bug#54180] [PATCH 06/12] home: symlink-manager: Avoid extra 'lstat' call. |
Date: |
Sun, 27 Feb 2022 16:52:25 +0100 |
User-agent: |
Evolution 3.38.3-1 |
Ludovic Courtès schreef op zo 27-02-2022 om 14:53 [+0100]:
> (define (symlink-to-store? path)
> - (and (equal? (stat:type (lstat path)) 'symlink)
> - (store-file-name? (readlink path))))
> + (catch 'system-error
> + (lambda ()
> + (store-file-name? (readlink path)))
> + (lambda args
> + (if (= EINVAL (system-error-errno args))
> + #f
> + (apply throw args)))))
I think it would be slightly clearer if 'store-file-name?' was moved
outside the catch:
(and=> (catch 'system-error (lambda () (readlink path)) [...])
store-file-name?)
It is 'readlink' that might throw an exception, not 'store-file-name?'.
Greetings,
Maxime.
signature.asc
Description: This is a digitally signed message part
- [bug#54180] [PATCH 00/12] Home: Clarify and better test symlink-manager.scm, Ludovic Courtès, 2022/02/27
- [bug#54180] [PATCH 01/12] home: symlink-manager: Clarify module imports., Ludovic Courtès, 2022/02/27
- [bug#54180] [PATCH 03/12] home: symlink-manager: Use 'for-each' when used for effects., Ludovic Courtès, 2022/02/27
- [bug#54180] [PATCH 02/12] home: symlink-manager: Move helper procedures as top-level defines., Ludovic Courtès, 2022/02/27
- [bug#54180] [PATCH 06/12] home: symlink-manager: Avoid extra 'lstat' call., Ludovic Courtès, 2022/02/27
- [bug#54180] [PATCH 06/12] home: symlink-manager: Avoid extra 'lstat' call.,
Maxime Devos <=
- [bug#54180] [PATCH 12/12] home: symlink-manager: Rename "path" to "file" where appropriate., Ludovic Courtès, 2022/02/27
- [bug#54180] [PATCH 07/12] tests: Make sure 'guix home reconfigure' backs up files., Ludovic Courtès, 2022/02/27
- [bug#54180] [PATCH 11/12] home: symlink-manager: 'create-symlinks' uses 'file-system-fold'., Ludovic Courtès, 2022/02/27
- [bug#54180] [PATCH 05/12] home: symlink-manager: Remove 'empty-directory?' and avoid TOCTTOU race., Ludovic Courtès, 2022/02/27
- [bug#54180] [PATCH 04/12] home: symlink-manager: Use 'file-is-directory?'., Ludovic Courtès, 2022/02/27
- [bug#54180] [PATCH 08/12] tests: Simplify use of 'local-file' in 'tests/guix-home.sh'., Ludovic Courtès, 2022/02/27
- [bug#54180] [PATCH 10/12] home: symlink-manager: 'cleanup-symlinks' uses 'file-system-fold'., Ludovic Courtès, 2022/02/27
- [bug#54180] [PATCH 09/12] tests: Check 'guix home reconfigure' for a second generation., Ludovic Courtès, 2022/02/27