From: hadaq <hadaq>
Date: Wed, 5 Feb 2003 16:54:46 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=a7b7bd4ce7c030b4a6c7669e352bea4a0e45597c;p=daqdata.git

*** empty log message ***
---

diff --git a/allParam/ca/client/caParam.c b/allParam/ca/client/caParam.c
index 6e2a2fd..26c950b 100644
--- a/allParam/ca/client/caParam.c
+++ b/allParam/ca/client/caParam.c
@@ -1,4 +1,4 @@
-static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/client/caParam.c,v 1.23 2003-02-05 13:17:59 hadaq Exp $";
+static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/client/caParam.c,v 1.24 2003-02-05 16:54:46 hadaq Exp $";
 #define _POSIX_C_SOURCE 199509L
 
 #if HAVE_CONFIG_H
@@ -124,7 +124,7 @@ int conSetupParam(Param *my, const char *setup)
 				strcpy(my->basedir, "");
 			}
 		}
-		if (strlen(my->basedir)) {
+		if ((NULL != my->basedir) && strlen(my->basedir)) {
 			strcat(my->basedir, "/");
 		}
 	}
diff --git a/allParam/file/fileParam.c b/allParam/file/fileParam.c
index 27ca069..dc285a1 100644
--- a/allParam/file/fileParam.c
+++ b/allParam/file/fileParam.c
@@ -1,4 +1,4 @@
-static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/file/fileParam.c,v 1.22 2003-02-05 13:17:59 hadaq Exp $";
+static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/file/fileParam.c,v 1.23 2003-02-05 16:54:46 hadaq Exp $";
 #define _POSIX_C_SOURCE 199509L
 
 #if HAVE_CONFIG_H
@@ -105,7 +105,7 @@ int conSetupParam(Param *my, const char *setup)
 				strcpy(my->basedir, "");
 			}
 		}
-		if (strlen(my->basedir)) {
+		if ((NULL != my->basedir) && strlen(my->basedir)) {
 			strcat(my->basedir, "/");
 		}
 	} else {
@@ -199,7 +199,7 @@ int conParam(Param *my)
 				strcpy(my->basedir, "");
 			}
 		}
-		if (strlen(my->basedir)) {
+		if ((NULL != my->basedir) && strlen(my->basedir)) {
 			strcat(my->basedir, "/");
 		}
 	} else {
diff --git a/allParam/ora/oraParam.pc b/allParam/ora/oraParam.pc
index 35578f5..666c538 100644
--- a/allParam/ora/oraParam.pc
+++ b/allParam/ora/oraParam.pc
@@ -1,4 +1,4 @@
-static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ora/oraParam.pc,v 1.29 2003-02-05 13:17:59 hadaq Exp $";
+static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ora/oraParam.pc,v 1.30 2003-02-05 16:54:46 hadaq Exp $";
 #define _POSIX_C_SOURCE 199509L
 
 #if HAVE_CONFIG_H
@@ -59,7 +59,7 @@ int conSetupParam(Param *my, const char *setup)
 			strcpy(my->basedir, "");
 		}
 	}
-	if (strlen(my->basedir)) {
+	if ((NULL != my->basedir) && strlen(my->basedir)) {
 		strcat(my->basedir, "/");
 	}
 
diff --git a/allParam/tcl/tclParam.c b/allParam/tcl/tclParam.c
index 97c29b1..197621d 100644
--- a/allParam/tcl/tclParam.c
+++ b/allParam/tcl/tclParam.c
@@ -1,4 +1,4 @@
-static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/tcl/tclParam.c,v 1.25 2003-02-05 13:17:59 hadaq Exp $";
+static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/tcl/tclParam.c,v 1.26 2003-02-05 16:54:46 hadaq Exp $";
 #define _POSIX_C_SOURCE 199509L
 
 #if HAVE_CONFIG_H
@@ -72,7 +72,7 @@ int conSetupParam(Param *my, const char *setup)
 				strcpy(my->basedir, "");
 			}
 		}
-		if (strlen(my->basedir)) {
+		if ((NULL != my->basedir) && strlen(my->basedir)) {
 			strcat(my->basedir, "/");
 		}
 	} else {
@@ -130,7 +130,7 @@ int conParam(Param *my)
 				strcpy(my->basedir, "");
 			}
 		}
-		if (strlen(my->basedir)) {
+		if ((NULL != my->basedir) && strlen(my->basedir)) {
 			strcat(my->basedir, "/");
 		}
 	} else {