aboutsummaryrefslogtreecommitdiffstats
path: root/g13/suspend.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2020-10-20 08:43:55 +0000
committerWerner Koch <[email protected]>2020-10-20 10:15:55 +0000
commitc94ee1386e0d5cdac51086c4d5b92de59c09c9b5 (patch)
tree34089b99da850a449f95ab9dd7e88317194b5f11 /g13/suspend.c
parentgpg,ecc: Fix SOS handling when receiving from agent. (diff)
downloadgnupg-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 'g13/suspend.c')
-rw-r--r--g13/suspend.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/g13/suspend.c b/g13/suspend.c
index 0aa20f01c..44c52ddc5 100644
--- a/g13/suspend.c
+++ b/g13/suspend.c
@@ -28,6 +28,7 @@
#include "g13.h"
#include "../common/i18n.h"
+#include "../common/sysutils.h"
#include "suspend.h"
#include "keyblob.h"
@@ -45,7 +46,7 @@ g13_suspend_container (ctrl_t ctrl, const char *filename)
int needs_syshelp;
/* A quick check to see whether the container exists. */
- if (access (filename, R_OK))
+ if (gnupg_access (filename, R_OK))
return gpg_error_from_syserror ();
/* Decide whether we need to use the g13-syshelp because we can't
@@ -80,7 +81,7 @@ g13_resume_container (ctrl_t ctrl, const char *filename)
char *mountpoint_buffer = NULL;
/* A quick check to see whether the container exists. */
- if (access (filename, R_OK))
+ if (gnupg_access (filename, R_OK))
return gpg_error_from_syserror ();
/* Decide whether we need to use the g13-syshelp because we can't