security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

common: New functions gnupg_opendir et al.

Browse source 
* 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
Backported-from-master: 7e22e08e2a
This commit is contained in:
Werner Koch 2020-10-21 16:59:38 +02:00
parent 4252cd7b18
commit 5f8123df78
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
8 changed files with 210 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

22
tools/gpg-wks-server.c
View file

@ -1608,22 +1608,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;
@ -1663,8 +1663,7 @@ get_domain_list (strlist_t *r_list)
leave:
free_strlist (list);
if (dir)
closedir (dir);
gnupg_closedir (dir);
xfree (fname);
return err;
}
@ -1677,8 +1676,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 ();
@ -1691,7 +1690,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 ();
@ -1700,7 +1699,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;
@ -1749,8 +1748,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;