diff options
| author | Werner Koch <[email protected]> | 2020-10-20 08:43:55 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2020-10-20 10:15:55 +0000 |
| commit | c94ee1386e0d5cdac51086c4d5b92de59c09c9b5 (patch) | |
| tree | 34089b99da850a449f95ab9dd7e88317194b5f11 /g10/tdbio.c | |
| parent | gpg,ecc: Fix SOS handling when receiving from agent. (diff) | |
| download | gnupg-c94ee1386e0d5cdac51086c4d5b92de59c09c9b5.tar.gz gnupg-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 'g10/tdbio.c')
| -rw-r--r-- | g10/tdbio.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/g10/tdbio.c b/g10/tdbio.c index 9f01667b4..2b2944fdd 100644 --- a/g10/tdbio.c +++ b/g10/tdbio.c @@ -711,17 +711,19 @@ tdbio_set_dbname (ctrl_t ctrl, const char *new_dbname, log_assert (p); save_slash = *p; *p = 0; - if (access (fname, F_OK)) + if (gnupg_access (fname, F_OK)) { try_make_homedir (fname); - if (access (fname, F_OK)) + if (gnupg_access (fname, F_OK)) log_fatal (_("%s: directory does not exist!\n"), fname); } *p = save_slash; take_write_lock (); - if (access (fname, R_OK) || stat (fname, &statbuf) || statbuf.st_size == 0) + if (gnupg_access (fname, R_OK) + || stat (fname, &statbuf) + || statbuf.st_size == 0) { FILE *fp; TRUSTREC rec; |