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/keyring.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/keyring.c')
| -rw-r--r-- | g10/keyring.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/g10/keyring.c b/g10/keyring.c index 9cd66db3a..f9ac83615 100644 --- a/g10/keyring.c +++ b/g10/keyring.c @@ -228,7 +228,7 @@ keyring_is_writable (void *token) { KR_RESOURCE r = token; - return r? (r->read_only || !access (r->fname, W_OK)) : 0; + return r? (r->read_only || !gnupg_access (r->fname, W_OK)) : 0; } @@ -1601,6 +1601,7 @@ static int do_copy (int mode, const char *fname, KBNODE root, off_t start_offset, unsigned int n_packets ) { + gpg_err_code_t ec; IOBUF fp, newfp; int rc=0; char *bakfname = NULL; @@ -1608,8 +1609,8 @@ do_copy (int mode, const char *fname, KBNODE root, /* Open the source file. Because we do a rename, we have to check the permissions of the file */ - if (access (fname, W_OK)) - return gpg_error_from_syserror (); + if ((ec = gnupg_access (fname, W_OK))) + return gpg_error (ec); fp = iobuf_open (fname); if (mode == 1 && !fp && errno == ENOENT) { |