]> source.dussan.org Git - rspamd.git/commitdiff
[Minor] Refrain from readdir_r usage
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Tue, 9 Jan 2018 11:47:42 +0000 (11:47 +0000)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Tue, 9 Jan 2018 18:41:43 +0000 (18:41 +0000)
src/client/rspamc.c

index 5b52536284bdf0285303ee32457aba69db5756bc..bcc302f952ddd40fecd8365f3af3dded15778261 100644 (file)
@@ -1680,26 +1680,17 @@ rspamc_process_dir (struct event_base *ev_base, struct rspamc_command *cmd,
        const gchar *name, GQueue *attrs)
 {
        DIR *d;
-       struct dirent *entry, *pentry;
+       struct dirent *pentry;
        gint cur_req = 0;
        gchar fpath[PATH_MAX];
        FILE *in;
        struct stat st;
        gboolean is_reg, is_dir;
-       gsize len;
 
        d = opendir (name);
 
        if (d != NULL) {
-               /* Portably allocate struct direntry */
-               len = rspamd_dirent_size (d);
-               g_assert (len != (gsize)-1);
-               entry = g_malloc0 (len);
-
-               while (readdir_r (d, entry, &pentry) == 0 && pentry != NULL) {
-                       if (pentry == NULL) {
-                               break;
-                       }
+               while ((pentry = readdir (d))!= NULL) {
 
                        if (pentry->d_name[0] == '.') {
                                continue;
@@ -1765,8 +1756,6 @@ rspamc_process_dir (struct event_base *ev_base, struct rspamc_command *cmd,
                                }
                        }
                }
-
-               g_free (entry);
        }
        else {
                fprintf (stderr, "cannot open directory %s: %s\n", name, strerror (errno));