X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fsensor.c;h=ae5cdf400f6e95f7623c6a7b7034a9b3a281823f;hb=544b54c409f3731b8e1581af95072a64ff393a28;hp=816a895561e67da8b3f1e5260deec33cfdfe90c1;hpb=a44dc75609448e871feb189bb81f84411256f52b;p=matches%2FMCTX3420.git

diff --git a/server/sensor.c b/server/sensor.c
index 816a895..ae5cdf4 100644
--- a/server/sensor.c
+++ b/server/sensor.c
@@ -122,11 +122,15 @@ void Sensor_SetMode(Sensor * s, ControlModes mode, void * arg)
 			{
 				// Set filename
 				char filename[BUFSIZ];
-				const char *experiment_name = (const char*) arg;
+				const char *experiment_path = (const char*) arg;
+				int ret;
+
+				ret = snprintf(filename, BUFSIZ, "%s/sensor_%d", experiment_path, s->id);
 
-				if (snprintf(filename, BUFSIZ, "%s_%d", experiment_name, s->id) >= BUFSIZ)
+				if (ret >= BUFSIZ) 
 				{
-					Fatal("Experiment name \"%s\" too long (>%d)", experiment_name, BUFSIZ);
+					Fatal("Experiment path \"%s\" too long (%d, limit %d)",
+							experiment_path, ret, BUFSIZ);
 				}
 
 				Log(LOGDEBUG, "Sensor %d with DataFile \"%s\"", s->id, filename);
@@ -306,7 +310,6 @@ void Sensor_Handler(FCGIContext *context, char * params)
 	struct timespec now;
 	clock_gettime(CLOCK_MONOTONIC, &now);
 	double current_time = TIMEVAL_DIFF(now, *Control_GetStartTime());
-
 	int id = 0;
 	const char * name = "";
 	double start_time = 0;