diff options
Diffstat (limited to 'kbx')
| -rw-r--r-- | kbx/keybox-init.c | 3 | ||||
| -rw-r--r-- | kbx/keybox-update.c | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/kbx/keybox-init.c b/kbx/keybox-init.c index e6c3ad284..c05ef52e6 100644 --- a/kbx/keybox-init.c +++ b/kbx/keybox-init.c @@ -25,6 +25,7 @@ #include <assert.h> #include "keybox-defs.h" +#include "../common/sysutils.h" #include "../common/mischelp.h" static KB_NAME kb_names; @@ -80,7 +81,7 @@ keybox_is_writable (void *token) { KB_NAME r = token; - return r? !access (r->fname, W_OK) : 0; + return r? !gnupg_access (r->fname, W_OK) : 0; } diff --git a/kbx/keybox-update.c b/kbx/keybox-update.c index e25596b26..c797f3ba5 100644 --- a/kbx/keybox-update.c +++ b/kbx/keybox-update.c @@ -161,6 +161,7 @@ static int blob_filecopy (int mode, const char *fname, KEYBOXBLOB blob, int secret, int for_openpgp, off_t start_offset) { + gpg_err_code_t ec; FILE *fp, *newfp; int rc=0; char *bakfname = NULL; @@ -170,8 +171,8 @@ blob_filecopy (int mode, const char *fname, KEYBOXBLOB blob, /* 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 = fopen (fname, "rb"); if (mode == FILECOPY_INSERT && !fp && errno == ENOENT) @@ -626,6 +627,7 @@ keybox_delete (KEYBOX_HANDLE hd) int keybox_compress (KEYBOX_HANDLE hd) { + gpg_err_code_t ec; int read_rc, rc; const char *fname; FILE *fp, *newfp; @@ -651,8 +653,8 @@ keybox_compress (KEYBOX_HANDLE hd) /* 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 = fopen (fname, "rb"); if (!fp && errno == ENOENT) |