From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 6 Jul 2008 14:40:33 +0000 (+0200)
Subject: qmail plugin: Use `readdir_r' instead of `readdir'.
X-Git-Tag: collectd-4.5.0~96
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=752e52bc98874f891ae0756b6ab8ccb9a2442650;p=collectd.git

qmail plugin: Use `readdir_r' instead of `readdir'.
---

diff --git a/src/qmail.c b/src/qmail.c
index 74386c38..063eee93 100644
--- a/src/qmail.c
+++ b/src/qmail.c
@@ -58,8 +58,15 @@ static void qmail_submit (const char *plugin_instance, gauge_t value)
 
 static int count_files_in_subtree (const char *path, int depth)
 {
+#if NAME_MAX < 1024
+# define DIRENT_BUFFER_SIZE (sizeof (struct dirent) + 1024 + 1)
+#else
+# define DIRENT_BUFFER_SIZE (sizeof (struct dirent) + NAME_MAX + 1)
+#endif
+
   DIR *dh;
   struct dirent *de;
+  char dirent_buffer[DIRENT_BUFFER_SIZE];
   int status;
 
   char **subdirs;
@@ -79,11 +86,27 @@ static int count_files_in_subtree (const char *path, int depth)
   subdirs_num = 0;
 
   count = 0;
-  while ((de = readdir (dh)) != NULL)
+  while (42)
   {
     char abs_path[PATH_MAX];
     struct stat statbuf;
 
+    de = NULL;
+    status = readdir_r (dh, (struct dirent *) dirent_buffer, &de);
+    if (status != 0)
+    {
+      char errbuf[4096];
+      ERROR ("qmail plugin: readdir_r failed: %s",
+          sstrerror (errno, errbuf, sizeof (errbuf)));
+      closedir (dh);
+      return (-1);
+    }
+    else if (de == NULL)
+    {
+      /* end of directory */
+      break;
+    }
+
     if (de->d_name[0] == '.')
       continue;