diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gpg-pair-tool.c | 11 | ||||
| -rw-r--r-- | tools/gpg-wks-server.c | 22 | ||||
| -rw-r--r-- | tools/gpgtar-create.c | 2 |
3 files changed, 17 insertions, 18 deletions
diff --git a/tools/gpg-pair-tool.c b/tools/gpg-pair-tool.c index 4a9a6f56c..4054f5d19 100644 --- a/tools/gpg-pair-tool.c +++ b/tools/gpg-pair-tool.c @@ -1701,8 +1701,8 @@ expire_old_states (void) { gpg_error_t err = 0; const char *dirname; - DIR *dir = NULL; - struct dirent *dir_entry; + gnupg_dir_t dir = NULL; + gnupg_dirent_t dir_entry; char *fname = NULL; estream_t fp = NULL; nvc_t nvc = NULL; @@ -1712,14 +1712,14 @@ expire_old_states (void) unsigned long now = gnupg_get_time (); dirname = get_pairing_statedir (); - dir = opendir (dirname); + dir = gnupg_opendir (dirname); if (!dir) { err = gpg_error_from_syserror (); goto leave; } - while ((dir_entry = readdir (dir))) + while ((dir_entry = gnupg_readdir (dir))) { if (strlen (dir_entry->d_name) != 16+4 || strcmp (dir_entry->d_name + 16, ".pa1")) @@ -1781,8 +1781,7 @@ expire_old_states (void) if (err) log_error ("expiring old states in '%s' failed: %s\n", dirname, gpg_strerror (err)); - if (dir) - closedir (dir); + gnupg_closedir (dir); es_fclose (fp); xfree (fname); } diff --git a/tools/gpg-wks-server.c b/tools/gpg-wks-server.c index 0cfe47fba..937479260 100644 --- a/tools/gpg-wks-server.c +++ b/tools/gpg-wks-server.c @@ -1613,22 +1613,22 @@ static gpg_error_t get_domain_list (strlist_t *r_list) { gpg_error_t err; - DIR *dir = NULL; + gnupg_dir_t dir = NULL; char *fname = NULL; - struct dirent *dentry; + gnupg_dirent_t dentry; struct stat sb; strlist_t list = NULL; *r_list = NULL; - dir = opendir (opt.directory); + dir = gnupg_opendir (opt.directory); if (!dir) { err = gpg_error_from_syserror (); goto leave; } - while ((dentry = readdir (dir))) + while ((dentry = gnupg_readdir (dir))) { if (*dentry->d_name == '.') continue; @@ -1668,8 +1668,7 @@ get_domain_list (strlist_t *r_list) leave: free_strlist (list); - if (dir) - closedir (dir); + gnupg_closedir (dir); xfree (fname); return err; } @@ -1682,8 +1681,8 @@ expire_one_domain (const char *top_dirname, const char *domain) gpg_error_t err; char *dirname; char *fname = NULL; - DIR *dir = NULL; - struct dirent *dentry; + gnupg_dir_t dir = NULL; + gnupg_dirent_t dentry; struct stat sb; time_t now = gnupg_get_time (); @@ -1696,7 +1695,7 @@ expire_one_domain (const char *top_dirname, const char *domain) goto leave; } - dir = opendir (dirname); + dir = gnupg_opendir (dirname); if (!dir) { err = gpg_error_from_syserror (); @@ -1705,7 +1704,7 @@ expire_one_domain (const char *top_dirname, const char *domain) goto leave; } - while ((dentry = readdir (dir))) + while ((dentry = gnupg_readdir (dir))) { if (*dentry->d_name == '.') continue; @@ -1754,8 +1753,7 @@ expire_one_domain (const char *top_dirname, const char *domain) err = 0; leave: - if (dir) - closedir (dir); + gnupg_closedir (dir); xfree (dirname); xfree (fname); return err; diff --git a/tools/gpgtar-create.c b/tools/gpgtar-create.c index d13b1dc7e..6114d68ff 100644 --- a/tools/gpgtar-create.c +++ b/tools/gpgtar-create.c @@ -301,6 +301,8 @@ scan_directory (const char *dname, scanctrl_t scanctrl) gpg_error_t err = 0; #ifdef HAVE_W32_SYSTEM + /* Note that we introduced gnupg_opendir only after we had deployed + * this code and thus we don't change it for now. */ WIN32_FIND_DATAW fi; HANDLE hd = INVALID_HANDLE_VALUE; char *p; |