From 03692d0ad95fc81dcf1bc8367fb71c035e0992c8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=B6rn=20Adamczewski-Musch?= <j.adamczewski@gsi.de>
Date: Thu, 21 Feb 2013 10:31:48 +0100
Subject: [PATCH] Bugfix in openFile as suggested by Rafal Lalik: Use
 additional fileNameFull string to compose full filename instead of sprintf
 with identical source and dest string.

---
 hadaq/evtbuild.c | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c
index 85eb515..bf14c1d 100644
--- a/hadaq/evtbuild.c
+++ b/hadaq/evtbuild.c
@@ -28,6 +28,8 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada
 #include <libgen.h>
 #include <allParam.h>
 
+#include <limits.h>
+
 #include "grmblfx.h"
 #include "worker.h"
 #include "evt.h"
@@ -497,7 +499,8 @@ static void changeDisk(int once, TheArgs *theArgs, TheStats *theStats)
 
 static int openFile(TheArgs *theArgs, TheStats *theStats)
 {
-	char fileName[_POSIX_PATH_MAX];
+	char fileName[_POSIX_PATH_MAX];  		/* preliminary file name*/
+	char fileNameFull[_POSIX_PATH_MAX];		/* final file name with full suffix etc.*/
 	static char outPath[_POSIX_PATH_MAX];
 	static char outLustrePath[_POSIX_PATH_MAX];
 	static char sec_path[_POSIX_PATH_MAX];
@@ -555,14 +558,15 @@ static int openFile(TheArgs *theArgs, TheStats *theStats)
 	 *   can be in the usual format without EB identificator.
 	 */
 	if (theArgs->epicsCtrl && theArgs->ebnum > 0)
-		sprintf(fileName, "%s%02d.hld", fileName, theArgs->ebnum);
+		sprintf(fileNameFull, "%s%02d.hld", fileName, theArgs->ebnum);
 	else
-		sprintf(fileName, "%s.hld", fileName);
+		sprintf(fileNameFull, "%s.hld", fileName);
 
 
 	if (open_count) {
-		sprintf(fileName, "%s-%02d", fileName, open_count);	/* add cycle number to file  */
-		sprintf(msglog, "<W> openFile: Using filename  %s", fileName);
+		sprintf(fileName, "%s-%02d", fileNameFull, open_count);	/* add cycle number to file  */
+		strncpy(fileNameFull, fileName,_POSIX_PATH_MAX);
+		sprintf(msglog, "<W> openFile: Using filename  %s", fileNameFull);
 		storeLogInfo(theArgs, msglog);
 	}
 
@@ -574,7 +578,7 @@ static int openFile(TheArgs *theArgs, TheStats *theStats)
 	/* #endif */
 	/*      strcmp(theArgs->lustrePath, "") != 0 ){ */
 
-	strcpy(theArgs->fileName, fileName);
+	strcpy(theArgs->fileName, fileNameFull);
 
 	/*  } */
 
@@ -590,14 +594,14 @@ static int openFile(TheArgs *theArgs, TheStats *theStats)
 		outFile = stdout;
 	} else if (strcmp(theArgs->outDev, "file") == 0) {
 		if (strcmp(theArgs->outPath, "") == 0) {
-			strcpy(theArgs->outPath, fileName);
+			strcpy(theArgs->outPath, fileNameFull);
 		} else {
 			struct stat bufS, *buf = &bufS;
 
 			stat(theArgs->outPath, buf);
 			if (S_ISDIR(buf->st_mode)) {
 				strcat(theArgs->outPath, "/");
-				strcat(theArgs->outPath, fileName);
+				strcat(theArgs->outPath, fileNameFull);
 			}
 		}
 
@@ -624,7 +628,7 @@ static int openFile(TheArgs *theArgs, TheStats *theStats)
 		}
 	} else if (strcmp(theArgs->outDev, "tape") == 0) {
 		if (strcmp(theArgs->outPath, "") == 0) {
-			strcpy(theArgs->outPath, fileName);
+			strcpy(theArgs->outPath, fileNameFull);
 		}
 		if (NULL == (outTape = openAnsiTape(theArgs->outPath, "/dev/tape"))) {
 			syslog(LOG_ERR, "opening tape %s: %s", theArgs->outPath, strerror(errno));
@@ -647,14 +651,14 @@ static int openFile(TheArgs *theArgs, TheStats *theStats)
 			dirSize = get_directory_size(sec_path);
 		}
 		if (strcmp(theArgs->sec_path, "") == 0) {
-			strcpy(theArgs->sec_path, fileName);
+			strcpy(theArgs->sec_path, fileNameFull);
 		} else {
 			struct stat bufS, *buf = &bufS;
 
 			stat(theArgs->sec_path, buf);
 			if (S_ISDIR(buf->st_mode)) {
 				strcat(theArgs->sec_path, "/");
-				strcat(theArgs->sec_path, fileName);
+				strcat(theArgs->sec_path, fileNameFull);
 			}
 		}
 		if (NULL == (outSecondFile = fopen(theArgs->sec_path, "wb"))) {
@@ -685,7 +689,7 @@ static int openFile(TheArgs *theArgs, TheStats *theStats)
 		/* If lustrePath is a dir name, add fileName to the lustrePath */
 		if (S_ISDIR(buf->st_mode)) {
 			strcat(theArgs->lustrePath, "/");
-			strcat(theArgs->lustrePath, fileName);
+			strcat(theArgs->lustrePath, fileNameFull);
 		}
 
 		if (NULL == (outLustreFile = fopen(theArgs->lustrePath, "wb"))) {
@@ -714,7 +718,7 @@ static int openFile(TheArgs *theArgs, TheStats *theStats)
 		char rfioPath[_POSIX_PATH_MAX];
 		strcpy(rfioPath, theArgs->rfioRemotePath);
 		strcat(rfioPath, "/");
-		strcat(rfioPath, fileName);
+		strcat(rfioPath, fileNameFull);
 
 		fprintf(stderr, "<D> evtbuild.c, rfio_fnewfile(): trying to open remote file %s\n", rfioPath);
 		rev = rfio_fnewfile(fRemote, rfioPath);
-- 
2.43.0