Bugfix in treatment of non-alnum-characters in hostnames.

	-- Benjamin Sailer

diff --git a/allParam/ca/client/caParam.c b/allParam/ca/client/caParam.c
index a2f3b52eed9bf2e1266772826b71e85d439fd923..4c7ec27ff47c36137945403be5a2813dfe0497fa 100644 (file)
--- a/allParam/ca/client/caParam.c
+++ b/allParam/ca/client/caParam.c
@@ -1,5 +1,5 @@
 static const char rcsId[] =
-       "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/client/caParam.c,v 1.27 2003-02-12 17:11:49 sailer Exp $";
+       "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/client/caParam.c,v 1.28 2003-07-01 16:05:49 hadaq Exp $";
 #define _POSIX_C_SOURCE 199509L
 
 #if HAVE_CONFIG_H
@@ -83,6 +83,7 @@ typedef struct ParamConfirmStoreStructS {
 int conSetupParam(Param *my, const char *setup)
 {
        struct utsname bufferS, *buffer = &bufferS;
+       int i = 0;
        int retVal = 0;
        int row = 0;
        int status = ECA_NORMAL;
@@ -120,6 +121,12 @@ int conSetupParam(Param *my, const char *setup)
                }
                my->basedir = malloc(PARAM_MAX_VALUE_LEN);
                uname(buffer);
+               while (buffer->nodename[i]) {
+                       if (!isalnum(buffer->nodename[i])) {
+                               buffer->nodename[i] = '_';
+                       }
+                       i++;
+               }
                if (Param_getString
                        (my, buffer->nodename, "basedir", &row, my->basedir)
                        || (row != 1)) {

diff --git a/allParam/file/fileParam.c b/allParam/file/fileParam.c
index c0fa58133513c5882a408b3ebe4978c96eb48690..49276220121d5adc3ea0f7ad77c4bdc47ed14c00 100644 (file)
--- a/allParam/file/fileParam.c
+++ b/allParam/file/fileParam.c
@@ -1,5 +1,5 @@
 static const char rcsId[] =
-       "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/file/fileParam.c,v 1.24 2003-02-12 17:09:08 sailer Exp $";
+       "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/file/fileParam.c,v 1.25 2003-07-01 16:05:49 hadaq Exp $";
 #define _POSIX_C_SOURCE 199509L
 
 #if HAVE_CONFIG_H
@@ -36,6 +36,7 @@ int conSetupParam(Param *my, const char *setup)
        FILE *f;
        char buf[2 * (PARAM_MAX_NAME_LEN + 1)];
        int row = 0;
+       int i = 0;
        struct utsname bufferS, *buffer = &bufferS;
 
        my->strerror = NULL;
@@ -135,6 +136,12 @@ int conSetupParam(Param *my, const char *setup)
        if (retVal == 0) {
                my->basedir = malloc(PARAM_MAX_VALUE_LEN);
                uname(buffer);
+               while (buffer->nodename[i]) {
+                       if (!isalnum(buffer->nodename[i])) {
+                               buffer->nodename[i] = '_';
+                       }
+                       i++;
+               }
                if (Param_getString
                        (my, buffer->nodename, "basedir", &row, my->basedir)
                        || (row != 1)) {
@@ -162,6 +169,7 @@ int conParam(Param *my)
        char buf[2 * (PARAM_MAX_NAME_LEN + 1)];
        char *tmp;
        int row = 0;
+       int i = 0;
        struct utsname bufferS, *buffer = &bufferS;
 
        my->strerror = NULL;
@@ -260,6 +268,12 @@ int conParam(Param *my)
        if (retVal == 0) {
                my->basedir = malloc(PARAM_MAX_VALUE_LEN);
                uname(buffer);
+               while (buffer->nodename[i]) {
+                       if (!isalnum(buffer->nodename[i])) {
+                               buffer->nodename[i] = '_';
+                       }
+                       i++;
+               }
                if (Param_getString
                        (my, buffer->nodename, "basedir", &row, my->basedir)
                        || (row != 1)) {

diff --git a/allParam/tcl/tclParam.c b/allParam/tcl/tclParam.c
index 744e3f8e73eb201d6adfcebc4de0a2c17fbe99fd..7221b8f878f38ac3bc08bf9fbaa0f6defc7fab6a 100644 (file)
--- a/allParam/tcl/tclParam.c
+++ b/allParam/tcl/tclParam.c
@@ -1,5 +1,5 @@
 static const char rcsId[] =
-       "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/tcl/tclParam.c,v 1.29 2003-02-12 17:05:06 sailer Exp $";
+       "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/tcl/tclParam.c,v 1.30 2003-07-01 16:05:49 hadaq Exp $";
 #define _POSIX_C_SOURCE 199509L
 
 #if HAVE_CONFIG_H
@@ -40,6 +40,7 @@ int conSetupParam(Param *my, const char *setup)
        char *storageFile;
        int code;
        int row = 0;
+       int i = 0;
        struct utsname bufferS, *buffer = &bufferS;
 
        my->strerror = NULL;
@@ -100,6 +101,12 @@ int conSetupParam(Param *my, const char *setup)
        if (retVal == 0) {
                my->basedir = malloc(PARAM_MAX_VALUE_LEN);
                uname(buffer);
+               while (buffer->nodename[i]) {
+                       if (!isalnum(buffer->nodename[i])) {
+                               buffer->nodename[i] = '_';
+                       }
+                       i++;
+               }
                if (Param_getString
                        (my, buffer->nodename, "basedir", &row, my->basedir)
                        || (row != 1)) {
@@ -129,6 +136,7 @@ int conParam(Param *my)
        char *storageFile;
        int code;
        int row = 0;
+       int i = 0;
        struct utsname bufferS, *buffer = &bufferS;
 
        my->strerror = NULL;
@@ -186,6 +194,12 @@ int conParam(Param *my)
        if (retVal == 0) {
                my->basedir = malloc(PARAM_MAX_VALUE_LEN);
                uname(buffer);
+               while (buffer->nodename[i]) {
+                       if (!isalnum(buffer->nodename[i])) {
+                               buffer->nodename[i] = '_';
+                       }
+                       i++;
+               }
                if (Param_getString
                        (my, buffer->nodename, "basedir", &row, my->basedir)
                        || (row != 1)) {