diff options
| author | Werner Koch <wk@gnupg.org> | 2020-10-20 10:43:55 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2020-10-20 12:15:55 +0200 |
| commit | c94ee1386e0d5cdac51086c4d5b92de59c09c9b5 (patch) | |
| tree | 34089b99da850a449f95ab9dd7e88317194b5f11 /agent/findkey.c | |
| parent | gpg,ecc: Fix SOS handling when receiving from agent. (diff) | |
| download | gnupg2-c94ee1386e0d5cdac51086c4d5b92de59c09c9b5.tar.xz gnupg2-c94ee1386e0d5cdac51086c4d5b92de59c09c9b5.zip | |
Replace all calls to access by gnupg_access
* common/sysutils.c (gnupg_access): New. Replace all calls to access
by this wrapper.
* common/homedir.c (w32_shgetfolderpath): Change to return UTF-8
directory name.
(standard_homedir): Adjust for change.
(w32_commondir, gnupg_cachedir): Ditto.
--
Also use SHGetFolderPathW instead of SHGetFolderPathA on Windows.
This is required to correctly handle non-ascii filenames on Windows.
GnuPG-bug-id: 5098
Diffstat (limited to 'agent/findkey.c')
| -rw-r--r-- | agent/findkey.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/agent/findkey.c b/agent/findkey.c index fa9e5b548..dd39472a9 100644 --- a/agent/findkey.c +++ b/agent/findkey.c @@ -236,7 +236,7 @@ agent_write_private_key (const unsigned char *grip, /* FIXME: Write to a temp file first so that write failures during key updates won't lead to a key loss. */ - if (!force && !access (fname, F_OK)) + if (!force && !gnupg_access (fname, F_OK)) { log_error ("secret key file '%s' already exists\n", fname); xfree (fname); @@ -1324,7 +1324,7 @@ agent_key_available (const unsigned char *grip) fname = make_filename (gnupg_homedir (), GNUPG_PRIVATE_KEYS_DIR, hexgrip, NULL); - result = !access (fname, R_OK)? 0 : -1; + result = !gnupg_access (fname, R_OK)? 0 : -1; xfree (fname); return result; } |