diff options
author | Werner Koch <[email protected]> | 2020-10-21 14:59:38 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2020-10-21 15:00:32 +0000 |
commit | 7e22e08e2ab09cd3c2317f5e80e8ee47d46eff4b (patch) | |
tree | 3996132036db12b71643a087bee88515cb4bf8dc /dirmngr/certcache.c | |
parent | w32: Make gnupg_remove and gnupg_rename_file Unicode aware (diff) | |
download | gnupg-7e22e08e2ab09cd3c2317f5e80e8ee47d46eff4b.tar.gz gnupg-7e22e08e2ab09cd3c2317f5e80e8ee47d46eff4b.zip |
common: New functions gnupg_opendir et al.
* common/sysutils.h (struct gnupg_dirent_s): New.
* common/sysutils.c: Include dirent.h.
(struct gnupg_dir_s): New.
(gnupg_opendir, gnupg_readdir, gnupg_closedir): New. Change all
callers of opendir, readdir, and closedir to use these functions.
--
GnuPG-bug-id: 5098
Diffstat (limited to 'dirmngr/certcache.c')
-rw-r--r-- | dirmngr/certcache.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dirmngr/certcache.c b/dirmngr/certcache.c index 04da510a0..9ca6069a2 100644 --- a/dirmngr/certcache.c +++ b/dirmngr/certcache.c @@ -364,8 +364,8 @@ static gpg_error_t load_certs_from_dir (const char *dirname, unsigned int trustclass) { gpg_error_t err; - DIR *dir; - struct dirent *ep; + gnupg_dir_t dir; + gnupg_dirent_t ep; char *p; size_t n; estream_t fp; @@ -373,13 +373,13 @@ load_certs_from_dir (const char *dirname, unsigned int trustclass) ksba_cert_t cert; char *fname = NULL; - dir = opendir (dirname); + dir = gnupg_opendir (dirname); if (!dir) { return 0; /* We do not consider this a severe error. */ } - while ( (ep=readdir (dir)) ) + while ( (ep = gnupg_readdir (dir)) ) { p = ep->d_name; if (*p == '.' || !*p) @@ -447,7 +447,7 @@ load_certs_from_dir (const char *dirname, unsigned int trustclass) } xfree (fname); - closedir (dir); + gnupg_closedir (dir); return 0; } |