aboutsummaryrefslogtreecommitdiffstats
path: root/g10/migrate.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 /g10/migrate.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 'g10/migrate.c')
-rw-r--r--g10/migrate.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/migrate.c b/g10/migrate.c
index c52c67a77..9045ae66e 100644
--- a/g10/migrate.c
+++ b/g10/migrate.c
@@ -50,10 +50,10 @@ migrate_secring (ctrl_t ctrl)
char *agent_version = NULL;
secring = make_filename (gnupg_homedir (), "secring" EXTSEP_S "gpg", NULL);
- if (access (secring, F_OK))
+ if (gnupg_access (secring, F_OK))
goto leave; /* Does not exist or is not readable. */
flagfile = make_filename (gnupg_homedir (), V21_MIGRATION_FNAME, NULL);
- if (!access (flagfile, F_OK))
+ if (!gnupg_access (flagfile, F_OK))
goto leave; /* Does exist - fine. */
log_info ("starting migration from earlier GnuPG versions\n");