Changeset 451 for trunk/zoo-project/zoo-kernel/service_internal_python.c

Timestamp:

Jan 6, 2014, 11:09:29 AM (10 years ago)

Author:

djay

Message:

Small fixes for building on windows platform.

File:

• trunk/zoo-project/zoo-kernel/service_internal_python.c (modified) (4 diffs)

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

@@ -113 +113 @@
 
 int zoo_python_support(maps** main_conf,map* request,service* s,maps **real_inputs,maps **real_outputs){
+  char *pythonpath;
+  char *python_path;
   maps* m=*main_conf;
   maps* inputs=*real_inputs;
@@ -119 +121 @@
   char *ntmp=tmp0->value;
   map* tmp=NULL;
+  int hasToClean=0;
   tmp=getMapFromMaps(*main_conf,"env","PYTHONPATH");
-  char *python_path;
 #ifdef DEBUG
   fprintf(stderr,"PYTHON SUPPORT \n");
 #endif
-  fflush(stderr);
   if(tmp!=NULL){
 #ifdef DEBUG
@@ -131 +132 @@
     python_path=(char*)malloc((strlen(tmp->value))*sizeof(char));
     sprintf(python_path,"%s",tmp->value);
+    hasToClean=1;
   }
   else{
-    python_path=strdup(".");
+    python_path=".";
   }
   tmp=NULL;
   tmp=getMap(request,"metapath");
-  char *pythonpath;//=(char*)malloc((1+strlen(python_path)+2048)*sizeof(char));
   if(tmp!=NULL && strcmp(tmp->value,"")!=0){
     pythonpath=(char*)malloc((4+strlen(python_path)+strlen(ntmp)+strlen(tmp->value))*sizeof(char));
 #ifdef WIN32
-    sprintf(pythonpath,"%s/%s/;%s",ntmp,tmp->value,python_path);
-#else
-    sprintf(pythonpath,"%s/%s/:%s",ntmp,tmp->value,python_path);
+  sprintf(pythonpath,"%s/%s/;%s",ntmp,tmp->value,python_path);
+#else
+  sprintf(pythonpath,"%s/%s/:%s",ntmp,tmp->value,python_path);
 #endif
   }
@@ -164 +165 @@
   sprintf(toto,"PYTHONPATH=%s",pythonpath);
   putenv(toto);
-#endif
-  free(python_path);
+  free(toto);
+#endif
+  if(hasToClean>0)
+    free(python_path);
   free(pythonpath);