X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fvserver.c;h=dac4392693159ad63dc1a095536b5a4cbefe9d09;hb=fd9c88963b04c9e9050a952ba0f018493e8b7638;hp=7b83c6174a830a0da933f4bd0c90f1c1180b67a3;hpb=09c6d16ffba1b1b15e50579bbcf663f05f630932;p=collectd.git

diff --git a/src/vserver.c b/src/vserver.c
index 7b83c617..dac43926 100644
--- a/src/vserver.c
+++ b/src/vserver.c
@@ -57,12 +57,13 @@ static void traffic_submit (const char *plugin_instance,
 	vl.values = values;
 	vl.values_len = STATIC_ARRAY_SIZE (values);
 	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "vserver");
-	strncpy (vl.plugin_instance, plugin_instance, sizeof (vl.plugin_instance));
-	strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "vserver", sizeof (vl.plugin));
+	sstrncpy (vl.plugin_instance, plugin_instance, sizeof (vl.plugin_instance));
+	sstrncpy (vl.type, "if_octets", sizeof (vl.type));
+	sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
 
-	plugin_dispatch_values ("if_octets", &vl);
+	plugin_dispatch_values (&vl);
 } /* void traffic_submit */
 
 static void load_submit (const char *plugin_instance,
@@ -78,11 +79,12 @@ static void load_submit (const char *plugin_instance,
 	vl.values = values;
 	vl.values_len = STATIC_ARRAY_SIZE (values);
 	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "vserver");
-	strncpy (vl.plugin_instance, plugin_instance, sizeof (vl.plugin_instance));
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "vserver", sizeof (vl.plugin));
+	sstrncpy (vl.plugin_instance, plugin_instance, sizeof (vl.plugin_instance));
+	sstrncpy (vl.type, "load", sizeof (vl.type));
 
-	plugin_dispatch_values ("load", &vl);
+	plugin_dispatch_values (&vl);
 }
 
 static void submit_gauge (const char *plugin_instance, const char *type,
@@ -97,12 +99,13 @@ static void submit_gauge (const char *plugin_instance, const char *type,
 	vl.values = values;
 	vl.values_len = STATIC_ARRAY_SIZE (values);
 	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "vserver");
-	strncpy (vl.plugin_instance, plugin_instance, sizeof (vl.plugin_instance));
-	strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "vserver", sizeof (vl.plugin));
+	sstrncpy (vl.plugin_instance, plugin_instance, sizeof (vl.plugin_instance));
+	sstrncpy (vl.type, type, sizeof (vl.type));
+	sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
 
-	plugin_dispatch_values (type, &vl);
+	plugin_dispatch_values (&vl);
 } /* void submit_gauge */
 
 static inline long long __get_sock_bytes(const char *s)
@@ -117,11 +120,19 @@ static inline long long __get_sock_bytes(const char *s)
 
 static int vserver_read (void)
 {
+#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 			*proc;
 	struct dirent 	*dent; /* 42 */
+	char dirent_buffer[DIRENT_BUFFER_SIZE];
 
 	errno = 0;
-	if (NULL == (proc = opendir (PROCDIR)))
+	proc = opendir (PROCDIR);
+	if (proc == NULL)
 	{
 		char errbuf[1024];
 		ERROR ("vserver plugin: fopen (%s): %s", PROCDIR, 
@@ -129,26 +140,57 @@ static int vserver_read (void)
 		return (-1);
 	}
 
-	while (NULL != (dent = readdir (proc)))
+	while (42)
 	{
-		int  len;
+		size_t len;
 		char file[BUFSIZE];
 
 		FILE *fh;
 		char buffer[BUFSIZE];
 
+		struct stat statbuf;
 		char *cols[4];
 
+		int status;
+
+		status = readdir_r (proc, (struct dirent *) dirent_buffer, &dent);
+		if (status != 0)
+		{
+			char errbuf[4096];
+			ERROR ("vserver plugin: readdir_r failed: %s",
+					sstrerror (errno, errbuf, sizeof (errbuf)));
+			closedir (proc);
+			return (-1);
+		}
+		else if (dent == NULL)
+		{
+			/* end of directory */
+			break;
+		}
+
 		if (dent->d_name[0] == '.')
 			continue;
 
-		/* This is not a directory */
-		if (dent->d_type != DT_DIR)
+		len = snprintf (file, sizeof (file), PROCDIR "/%s", dent->d_name);
+		if ((len < 0) || (len >= BUFSIZE))
+			continue;
+		
+		status = stat (file, &statbuf);
+		if (status != 0)
+		{
+			char errbuf[4096];
+			WARNING ("vserver plugin: stat (%s) failed: %s",
+					file, sstrerror (errno, errbuf, sizeof (errbuf)));
+			continue;
+		}
+		
+		if (!S_ISDIR (statbuf.st_mode))
 			continue;
 
 		/* socket message accounting */
-		len = snprintf (file, BUFSIZE, PROCDIR "/%s/cacct", dent->d_name);
-		if ((len < 0) || (len >= BUFSIZE))
+		len = ssnprintf (file, sizeof (file),
+				PROCDIR "/%s/cacct", dent->d_name);
+		if ((len < 0) || (len >= sizeof (file)))
 			continue;
 
 		if (NULL == (fh = fopen (file, "r")))
@@ -194,8 +236,9 @@ static int vserver_read (void)
 		}
 
 		/* thread information and load */
-		len = snprintf (file, BUFSIZE, PROCDIR "/%s/cvirt", dent->d_name);
-		if ((len < 0) || (len >= BUFSIZE))
+		len = ssnprintf (file, sizeof (file),
+				PROCDIR "/%s/cvirt", dent->d_name);
+		if ((len < 0) || (len >= sizeof (file)))
 			continue;
 
 		if (NULL == (fh = fopen (file, "r")))
@@ -246,8 +289,9 @@ static int vserver_read (void)
 		}
 
 		/* processes and memory usage */
-		len = snprintf (file, BUFSIZE, PROCDIR "/%s/limit", dent->d_name);
-		if ((len < 0) || (len >= BUFSIZE))
+		len = ssnprintf (file, sizeof (file),
+				PROCDIR "/%s/limit", dent->d_name);
+		if ((len < 0) || (len >= sizeof (file)))
 			continue;
 
 		if (NULL == (fh = fopen (file, "r")))