X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fconfigfile.c;h=99dded93c8117aca7a780cfa6ae830163304fb7c;hb=75efef3359f6565c8833563414367b89fbeacc46;hp=2eea2362a5a39396eaabacef5a339202a624ad2d;hpb=c3533f89f324411112a8b80d7ff0d7afd1e70b5d;p=collectd.git

diff --git a/src/configfile.c b/src/configfile.c
index 2eea2362..99dded93 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/configfile.c
- * Copyright (C) 2005-2009  Florian octo Forster
+ * Copyright (C) 2005-2010  Florian octo Forster
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -96,9 +96,10 @@ static cf_global_option_t cf_global_options[] =
 	{"BaseDir",     NULL, PKGLOCALSTATEDIR},
 	{"PIDFile",     NULL, PIDFILE},
 	{"Hostname",    NULL, NULL},
-	{"FQDNLookup",  NULL, "false"},
+	{"FQDNLookup",  NULL, "true"},
 	{"Interval",    NULL, "10"},
 	{"ReadThreads", NULL, "5"},
+	{"Timeout",     NULL, "2"},
 	{"PreCacheChain",  NULL, "PreCache"},
 	{"PostCacheChain", NULL, "PostCache"}
 };
@@ -700,11 +701,10 @@ static oconfig_item_t *cf_read_generic (const char *path, int depth)
 		if (status != 0)
 		{
 			char errbuf[1024];
-			ERROR ("configfile: stat (%s) failed: %s",
+			WARNING ("configfile: stat (%s) failed: %s",
 					path_ptr,
 					sstrerror (errno, errbuf, sizeof (errbuf)));
-			oconfig_free (root);
-			return (NULL);
+			continue;
 		}
 
 		if (S_ISREG (statbuf.st_mode))
@@ -713,7 +713,7 @@ static oconfig_item_t *cf_read_generic (const char *path, int depth)
 			temp = cf_read_dir (path_ptr, depth);
 		else
 		{
-			ERROR ("configfile: %s is neither a file nor a "
+			WARNING ("configfile: %s is neither a file nor a "
 					"directory.", path);
 			continue;
 		}
@@ -730,6 +730,12 @@ static oconfig_item_t *cf_read_generic (const char *path, int depth)
 
 	wordfree (&we);
 
+	if (root->children == NULL)
+	{
+		oconfig_free (root);
+		return (NULL);
+	}
+
 	return (root);
 } /* oconfig_item_t *cf_read_generic */
 /* #endif HAVE_WORDEXP_H */
@@ -957,6 +963,45 @@ int cf_util_get_string (const oconfig_item_t *ci, char **ret_string) /* {{{ */
 	return (0);
 } /* }}} int cf_util_get_string */
 
+/* Assures the config option is a string and copies it to the provided buffer.
+ * Assures null-termination. */
+int cf_util_get_string_buffer (const oconfig_item_t *ci, char *buffer, /* {{{ */
+		size_t buffer_size)
+{
+	if ((ci == NULL) || (buffer == NULL) || (buffer_size < 1))
+		return (EINVAL);
+
+	if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING))
+	{
+		ERROR ("cf_util_get_string_buffer: The %s option requires "
+				"exactly one string argument.", ci->key);
+		return (-1);
+	}
+
+	strncpy (buffer, ci->values[0].value.string, buffer_size);
+	buffer[buffer_size - 1] = 0;
+
+	return (0);
+} /* }}} int cf_util_get_string_buffer */
+
+/* Assures the config option is a number and returns it as an int. */
+int cf_util_get_int (const oconfig_item_t *ci, int *ret_value) /* {{{ */
+{
+	if ((ci == NULL) || (ret_value == NULL))
+		return (EINVAL);
+
+	if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_NUMBER))
+	{
+		ERROR ("cf_util_get_int: The %s option requires "
+				"exactly one numeric argument.", ci->key);
+		return (-1);
+	}
+
+	*ret_value = (int) ci->values[0].value.number;
+
+	return (0);
+} /* }}} int cf_util_get_int */
+
 int cf_util_get_boolean (const oconfig_item_t *ci, _Bool *ret_bool) /* {{{ */
 {
 	if ((ci == NULL) || (ret_bool == NULL))
@@ -965,15 +1010,41 @@ int cf_util_get_boolean (const oconfig_item_t *ci, _Bool *ret_bool) /* {{{ */
 	if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_BOOLEAN))
 	{
 		ERROR ("cf_util_get_boolean: The %s option requires "
-				"exactly one string argument.", ci->key);
+				"exactly one boolean argument.", ci->key);
 		return (-1);
 	}
 
-	*ret_bool = ci->values[0].value.boolean ? true : false;
+	*ret_bool = ci->values[0].value.boolean ? 1 : 0;
 
 	return (0);
 } /* }}} int cf_util_get_boolean */
 
+int cf_util_get_flag (const oconfig_item_t *ci, /* {{{ */
+		unsigned int *ret_value, unsigned int flag)
+{
+	int status;
+	_Bool b;
+
+	if (ret_value == NULL)
+		return (EINVAL);
+
+	b = 0;
+	status = cf_util_get_boolean (ci, &b);
+	if (status != 0)
+		return (status);
+
+	if (b)
+	{
+		*ret_value |= flag;
+	}
+	else
+	{
+		*ret_value &= ~flag;
+	}
+
+	return (0);
+} /* }}} int cf_util_get_flag */
+
 /* Assures that the config option is a string. The string is then converted to
  * a port number using `service_name_to_port_number' and returned. Returns the
  * port number in the range [1-65535] or less than zero upon failure. */