X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrdtool.c;h=71da54749fe1d1a6377bbe450551e04658e433bb;hb=6725a91fd6be18b6f3475fc0eeccfb6424a73f5c;hp=80833902a21e7b05656c3d6baa4fb91ffd5d170d;hpb=bc389fa32a48a64306f7ec008f4548f05fdb7c80;p=collectd.git

diff --git a/src/rrdtool.c b/src/rrdtool.c
index 80833902..71da5474 100644
--- a/src/rrdtool.c
+++ b/src/rrdtool.c
@@ -251,6 +251,21 @@ static int value_list_to_filename (char *buffer, size_t buffer_size,
 	int status;
 	size_t len;
 
+	if (datadir != NULL)
+	{
+		size_t datadir_len = strlen (datadir) + 1;
+
+		if (datadir_len >= buffer_size)
+			return (ENOMEM);
+
+		sstrncpy (buffer, datadir, buffer_size);
+		buffer[datadir_len - 1] = '/';
+		buffer[datadir_len] = 0;
+
+		buffer += datadir_len;
+		buffer_size -= datadir_len;
+	}
+
 	status = FORMAT_VL (buffer, buffer_size, vl);
 	if (status != 0)
 		return (status);