alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1837 from eklitzke/readdir

Browse Source 
Use readdir(3) instead of deprecated readdir_r(3) in mu-maildir.c
This commit is contained in:
Dirk-Jan C. Binnema
2020-11-16 09:52:38 +02:00
committed by GitHub
parent c82f1a0834 bd2fe50a74
commit df954c82de
1 changed files with 9 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/mu-maildir.c
View File

@ -438,22 +438,6 @@ process_dir_entry (const char* path, const char* mdir, struct dirent *entry,
} }
static const size_t DIRENT_ALLOC_SIZE =
offsetof (struct dirent, d_name) + PATH_MAX;
static struct dirent*
dirent_new (void)
{
return (struct dirent*) g_new0(guchar, DIRENT_ALLOC_SIZE);
}
static void
dirent_destroy (struct dirent *entry)
{
g_slice_free1 (DIRENT_ALLOC_SIZE, entry);
}
#ifdef HAVE_STRUCT_DIRENT_D_INO #ifdef HAVE_STRUCT_DIRENT_D_INO
static int static int
dirent_cmp (struct dirent *d1, struct dirent *d2) dirent_cmp (struct dirent *d1, struct dirent *d2)
@ -480,20 +464,16 @@ process_dir_entries (DIR *dir, const char* path, const char* mdir,
GSList *lst, *c; GSList *lst, *c;
for (lst = NULL;;) { for (lst = NULL;;) {
int rv;
struct dirent *entry, *res; struct dirent *entry, *res;
entry = dirent_new (); errno = 0;
rv = readdir_r (dir, entry, &res); res = readdir (dir);
if (rv == 0) { if (res) {
if (res) entry = g_memdup (res, sizeof(struct dirent));
lst = g_slist_prepend (lst, entry); lst = g_slist_prepend (lst, entry);
else { } else if (errno == 0) {
dirent_destroy (entry); break;
break; /* last direntry reached */
}
} else { } else {
dirent_destroy (entry); g_warning ("error scanning dir: %s", strerror(errno));
g_warning ("error scanning dir: %s", strerror(rv));
return MU_ERROR_FILE; return MU_ERROR_FILE;
} }
} }
@ -508,7 +488,7 @@ process_dir_entries (DIR *dir, const char* path, const char* mdir,
result = process_dir_entry (path, mdir, (struct dirent*)c->data, result = process_dir_entry (path, mdir, (struct dirent*)c->data,
msg_cb, dir_cb, full, data); msg_cb, dir_cb, full, data);
g_slist_foreach (lst, (GFunc)dirent_destroy, NULL); g_slist_foreach (lst, (GFunc)g_free, NULL);
g_slist_free (lst); g_slist_free (lst);
return result; return result;