X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fconfigfile.c;h=8b526f2e958902a5dcbb22a674b0c0caa267f44f;hb=3c316743f0dccb70e49a10ed44951dd4b289d9f0;hp=ce4e7747c95af39aee1f55c9bf1479c2c3917da9;hpb=9ebb82bf36ac779a8af81f2e9a513226387a5679;p=collectd.git

diff --git a/src/configfile.c b/src/configfile.c
index ce4e7747..8b526f2e 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -18,6 +18,7 @@
  *
  * Authors:
  *   Florian octo Forster <octo at verplant.org>
+ *   Sebastian tokkee Harl <sh at tokkee.org>
  **/
 
 #include "collectd.h"
@@ -327,7 +328,7 @@ static int dispatch_block_plugin (oconfig_item_t *ci)
 		if (ci->children[i].children == NULL)
 			dispatch_value_plugin (name, ci->children + i);
 		else
-			{DEBUG ("No nested config blocks allow for this plugin.");}
+			{DEBUG ("No nested config blocks allowed for this plugin.");}
 	}
 
 	return (0);
@@ -423,6 +424,9 @@ static int cf_ci_append_children (oconfig_item_t *dst, oconfig_item_t *src)
 {
 	oconfig_item_t *temp;
 
+	if ((src == NULL) || (src->children_num == 0))
+		return (0);
+
 	temp = (oconfig_item_t *) realloc (dst->children,
 			sizeof (oconfig_item_t)
 			* (dst->children_num + src->children_num));
@@ -502,13 +506,20 @@ static oconfig_item_t *cf_read_file (const char *file, int depth)
 	return (root);
 } /* oconfig_item_t *cf_read_file */
 
+static int cf_compare_string (const void *p1, const void *p2)
+{
+	return strcmp (*(const char **) p1, *(const char **) p2);
+}
+
 static oconfig_item_t *cf_read_dir (const char *dir, int depth)
 {
 	oconfig_item_t *root = NULL;
 	DIR *dh;
 	struct dirent *de;
-	char name[1024];
+	char **filenames = NULL;
+	int filenames_num = 0;
 	int status;
+	int i;
 
 	assert (depth < CF_MAX_DEPTH);
 
@@ -531,7 +542,8 @@ static oconfig_item_t *cf_read_dir (const char *dir, int depth)
 
 	while ((de = readdir (dh)) != NULL)
 	{
-		oconfig_item_t *temp;
+		char   name[1024];
+		char **tmp;
 
 		if ((de->d_name[0] == '.') || (de->d_name[0] == '\0'))
 			continue;
@@ -543,18 +555,55 @@ static oconfig_item_t *cf_read_dir (const char *dir, int depth)
 			ERROR ("configfile: Not including `%s/%s' because its"
 					" name is too long.",
 					dir, de->d_name);
-			continue;
+			for (i = 0; i < filenames_num; ++i)
+				free (filenames[i]);
+			free (filenames);
+			free (root);
+			return (NULL);
+		}
+
+		++filenames_num;
+		tmp = (char **) realloc (filenames,
+				filenames_num * sizeof (*filenames));
+		if (tmp == NULL) {
+			ERROR ("configfile: realloc failed.");
+			for (i = 0; i < filenames_num - 1; ++i)
+				free (filenames[i]);
+			free (filenames);
+			free (root);
+			return (NULL);
 		}
+		filenames = tmp;
+
+		filenames[filenames_num - 1] = sstrdup (name);
+	}
+
+	qsort ((void *) filenames, filenames_num, sizeof (*filenames),
+			cf_compare_string);
+
+	for (i = 0; i < filenames_num; ++i)
+	{
+		oconfig_item_t *temp;
+		char *name = filenames[i];
 
 		temp = cf_read_generic (name, depth);
-		if (temp == NULL)
-			continue;
+		if (temp == NULL) {
+			int j;
+			for (j = i; j < filenames_num; ++j)
+				free (filenames[j]);
+			free (filenames);
+			oconfig_free (root);
+			return (NULL);
+		}
 
 		cf_ci_append_children (root, temp);
 		sfree (temp->children);
 		sfree (temp);
+
+		free (name);
 	}
 
+	free(filenames);
 	return (root);
 } /* oconfig_item_t *cf_read_dir */
 
@@ -600,6 +649,11 @@ static oconfig_item_t *cf_read_generic (const char *path, int depth)
 	}
 	memset (root, '\0', sizeof (oconfig_item_t));
 
+	/* wordexp() might return a sorted list already. That's not
+	 * documented though, so let's make sure we get what we want. */
+	qsort ((void *) we.we_wordv, we.we_wordc, sizeof (*we.we_wordv),
+			cf_compare_string);
+
 	for (i = 0; i < we.we_wordc; i++)
 	{
 		oconfig_item_t *temp;
@@ -614,6 +668,7 @@ static oconfig_item_t *cf_read_generic (const char *path, int depth)
 			ERROR ("configfile: stat (%s) failed: %s",
 					path_ptr,
 					sstrerror (errno, errbuf, sizeof (errbuf)));
+			oconfig_free (root);
 			return (NULL);
 		}
 
@@ -628,6 +683,11 @@ static oconfig_item_t *cf_read_generic (const char *path, int depth)
 			continue;
 		}
 
+		if (temp == NULL) {
+			oconfig_free (root);
+			return (NULL);
+		}
+
 		cf_ci_append_children (root, temp);
 		sfree (temp->children);
 		sfree (temp);
@@ -828,7 +888,11 @@ int cf_read (char *filename)
 			dispatch_block (conf->children + i);
 	}
 
+	oconfig_free (conf);
+
+	/* Read the default types.db if no `TypesDB' option was given. */
 	if (cf_default_typesdb)
-		read_types_list (PLUGINDIR"/types.db"); /* FIXME: Configure path */
+		read_types_list (PLUGINDIR"/types.db");
+
 	return (0);
 } /* int cf_read */