X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcommon.c;h=efd63c085452f7ba238247e1caade93d4bb35ac0;hb=dd324a1592259913e6e92d3b54e6fa2b0c5f38f7;hp=5de7d97b9ef3e9dfb090816aa2c1418567e4f43a;hpb=69441903172882014e9ac90df2ae6c813dfdfdf5;p=collectd.git

diff --git a/src/common.c b/src/common.c
index 5de7d97b..efd63c08 100644
--- a/src/common.c
+++ b/src/common.c
@@ -86,6 +86,47 @@ int ssnprintf (char *dest, size_t n, const char *format, ...)
 	return (ret);
 } /* int ssnprintf */
 
+char *ssnprintf_alloc (char const *format, ...) /* {{{ */
+{
+	char static_buffer[1024] = "";
+	char *alloc_buffer;
+	size_t alloc_buffer_size;
+	int status;
+	va_list ap;
+
+	/* Try printing into the static buffer. In many cases it will be
+	 * sufficiently large and we can simply return a strdup() of this
+	 * buffer. */
+	va_start (ap, format);
+	status = vsnprintf (static_buffer, sizeof (static_buffer), format, ap);
+	va_end (ap);
+	if (status < 0)
+		return (NULL);
+
+	/* "status" does not include the null byte. */
+	alloc_buffer_size = (size_t) (status + 1);
+	if (alloc_buffer_size <= sizeof (static_buffer))
+		return (strdup (static_buffer));
+
+	/* Allocate a buffer large enough to hold the string. */
+	alloc_buffer = malloc (alloc_buffer_size);
+	if (alloc_buffer == NULL)
+		return (NULL);
+	memset (alloc_buffer, 0, alloc_buffer_size);
+
+	/* Print again into this new buffer. */
+	va_start (ap, format);
+	status = vsnprintf (alloc_buffer, alloc_buffer_size, format, ap);
+	va_end (ap);
+	if (status < 0)
+	{
+		sfree (alloc_buffer);
+		return (NULL);
+	}
+
+	return (alloc_buffer);
+} /* }}} char *ssnprintf_alloc */
+
 char *sstrdup (const char *s)
 {
 	char *r;
@@ -361,6 +402,22 @@ int strunescape (char *buf, size_t buf_len)
 	return (0);
 } /* int strunescape */
 
+size_t strstripnewline (char *buffer)
+{
+	size_t buffer_len = strlen (buffer);
+
+	while (buffer_len > 0)
+	{
+		if ((buffer[buffer_len - 1] != '\n')
+				&& (buffer[buffer_len - 1] != '\r'))
+			break;
+		buffer_len--;
+		buffer[buffer_len] = 0;
+	}
+
+	return (buffer_len);
+} /* size_t strstripnewline */
+
 int escape_slashes (char *buf, int buf_len)
 {
 	int i;
@@ -845,18 +902,17 @@ int format_values (char *ret, size_t ret_len, /* {{{ */
         for (i = 0; i < ds->ds_num; i++)
         {
                 if (ds->ds[i].type == DS_TYPE_GAUGE)
-                        BUFFER_ADD (":%f", vl->values[i].gauge);
+                        BUFFER_ADD (":"GAUGE_FORMAT, vl->values[i].gauge);
                 else if (store_rates)
                 {
                         if (rates == NULL)
                                 rates = uc_get_rate (ds, vl);
                         if (rates == NULL)
                         {
-                                WARNING ("format_values: "
-						"uc_get_rate failed.");
+                                WARNING ("format_values: uc_get_rate failed.");
                                 return (-1);
                         }
-                        BUFFER_ADD (":%g", rates[i]);
+                        BUFFER_ADD (":"GAUGE_FORMAT, rates[i]);
                 }
                 else if (ds->ds[i].type == DS_TYPE_COUNTER)
                         BUFFER_ADD (":%llu", vl->values[i].counter);
@@ -866,7 +922,7 @@ int format_values (char *ret, size_t ret_len, /* {{{ */
                         BUFFER_ADD (":%"PRIu64, vl->values[i].absolute);
                 else
                 {
-                        ERROR ("format_values plugin: Unknown data source type: %i",
+                        ERROR ("format_values: Unknown data source type: %i",
                                         ds->ds[i].type);
                         sfree (rates);
                         return (-1);
@@ -1004,9 +1060,9 @@ int parse_value (const char *value_orig, value_t *ret_value, int ds_type)
   }
 
   if (value == endptr) {
-    sfree (value);
     ERROR ("parse_value: Failed to parse string as %s: %s.",
         DS_TYPE_TO_STRING (ds_type), value);
+    sfree (value);
     return -1;
   }
   else if ((NULL != endptr) && ('\0' != *endptr))
@@ -1204,18 +1260,25 @@ int walk_directory (const char *dir, dirwalk_callback_f callback,
 	return (0);
 }
 
-int read_file_contents (const char *filename, char *buf, int bufsize)
+ssize_t read_file_contents (const char *filename, char *buf, size_t bufsize)
 {
 	FILE *fh;
-	int n;
+	ssize_t ret;
 
-	if ((fh = fopen (filename, "r")) == NULL)
-		return -1;
+	fh = fopen (filename, "r");
+	if (fh == NULL)
+		return (-1);
 
-	n = fread(buf, 1, bufsize, fh);
-	fclose(fh);
+	ret = (ssize_t) fread (buf, 1, bufsize, fh);
+	if ((ret == 0) && (ferror (fh) != 0))
+	{
+		ERROR ("read_file_contents: Reading file \"%s\" failed.",
+				filename);
+		ret = -1;
+	}
 
-	return n;
+	fclose(fh);
+	return (ret);
 }
 
 counter_t counter_diff (counter_t old_value, counter_t new_value)
@@ -1403,3 +1466,35 @@ int strtoderive (const char *string, derive_t *ret_value) /* {{{ */
 	*ret_value = tmp;
 	return (0);
 } /* }}} int strtoderive */
+
+int strarray_add (char ***ret_array, size_t *ret_array_len, char const *str) /* {{{ */
+{
+	char **array;
+	size_t array_len = *ret_array_len;
+
+	if (str == NULL)
+		return (EINVAL);
+
+	array = realloc (*ret_array,
+            (array_len + 1) * sizeof (*array));
+	if (array == NULL)
+		return (ENOMEM);
+	*ret_array = array;
+
+	array[array_len] = strdup (str);
+	if (array[array_len] == NULL)
+		return (ENOMEM);
+
+	array_len++;
+        *ret_array_len = array_len;
+	return (0);
+} /* }}} int strarray_add */
+
+void strarray_free (char **array, size_t array_len) /* {{{ */
+{
+	size_t i;
+
+	for (i = 0; i < array_len; i++)
+		sfree (array[i]);
+	sfree (array);
+} /* }}} void strarray_free */