X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrdtool.c;h=c795e2656502685ca353937ddda2b9defcd3a518;hb=204cf4f8f68cadeac474a75584f27b7339aca4c4;hp=2f28329f0fbef43f17c70b3b7136a6b4f187e2b8;hpb=ba0be16485d017e2060bc3a1fef2cb0587a5336d;p=collectd.git

diff --git a/src/rrdtool.c b/src/rrdtool.c
index 2f28329f..c795e265 100644
--- a/src/rrdtool.c
+++ b/src/rrdtool.c
@@ -290,6 +290,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);