X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcommon.c;h=79e4c02c631841334307222430e02d4bc381153d;hb=5d9ad0bcb8b1ae1b7b0994f51237c04273f5cfbc;hp=b679bf70f4ccff6a385c47b5fb4f47ccbd26a8b1;hpb=d6d42818a8794a756727a6bb56e3680c7eefd6f9;p=collectd.git

diff --git a/src/common.c b/src/common.c
index b679bf70..79e4c02c 100644
--- a/src/common.c
+++ b/src/common.c
@@ -361,6 +361,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[buffer_len] = 0;
+		buffer_len--;
+	}
+
+	return (buffer_len);
+} /* size_t strstripnewline */
+
 int escape_slashes (char *buf, int buf_len)
 {
 	int i;
@@ -1197,18 +1213,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)
@@ -1396,3 +1419,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 */