Changeset 505 for trunk/zoo-project/zoo-kernel/service_internal.c

Timestamp:

Sep 23, 2014, 4:03:07 PM (10 years ago)

Author:

djay

Message:

Fixes for metapath definition with prefixed names.

File:

• trunk/zoo-project/zoo-kernel/service_internal.c (modified) (2 diffs)

trunk/zoo-project/zoo-kernel/service_internal.c

@@ -3105 +3105 @@
       if(tmpMap==NULL || strlen(tmpMap->value)==0){
         char *tmp01=zStrdup(tmp00->value);
+        tmp01[strlen(tmp01)-1]=0;
         setMapInMaps(conf,"lenv","metapath",tmp01);
         free(tmp01);
@@ -3111 +3112 @@
       else{
         if(tmp00!=NULL && tmpMap!=NULL){
-          char *value=(char*)malloc((strlen(tmp00->value)+strlen(tmpMap->value)+2)*sizeof(char));
-          sprintf(value,"%s/%s",tmpMap->value,tmp00->value);
+          char *tmp00s=zStrdup(tmp00->value);
+          tmp00s[strlen(tmp00s)-1]=0;
+          char *value=(char*)malloc((strlen(tmp00s)+strlen(tmpMap->value)+2)*sizeof(char));
+          sprintf(value,"%s/%s",tmpMap->value,tmp00s);
           setMapInMaps(conf,"lenv","metapath",value);
           free(value);
+          free(tmp00s);
           value=NULL;
         }