Changeset 355 for trunk

Timestamp:

Mar 2, 2012, 12:55:11 PM (13 years ago)

Author:

djay

Message:

Use dynamically allocated memory for Java CLASSPATH

File:

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

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

@@ -32 +32 @@
   getcwd(ntmp,1024);
   map* tmp=getMap(request,"metapath");
-  char classpath[2048];
-  char oclasspath[2068];
+  char *classpath;
+  char *oclasspath;
   int res=SERVICE_FAILED;
   char *cclasspath=getenv("CLASSPATH");
   if(tmp!=NULL){
-    if(cclasspath!=NULL)
+    if(cclasspath!=NULL){
+      classpath=(char*) malloc((strlen(ntmp)+strlen(tmp->value)+strlen(cclasspath)+4)*sizeof(char));
+      oclasspath=(char*) malloc((strlen(ntmp)+strlen(tmp->value)+strlen(cclasspath)+22)*sizeof(char));
       sprintf(classpath,"%s/%s/:%s",ntmp,tmp->value,cclasspath);
-    else
+    }
+    else{
+      classpath=(char*) malloc((strlen(ntmp)+strlen(tmp->value)+3)*sizeof(char));
+      oclasspath=(char*) malloc((strlen(ntmp)+strlen(tmp->value)+21)*sizeof(char));
       sprintf(classpath,"%s/%s/",ntmp,tmp->value);
-    sprintf(oclasspath,"-Djava.class.path=%s",classpath);
-  }
-  else{
-    if(cclasspath!=NULL)
-      sprintf(classpath,"%s:%s",ntmp,cclasspath);
-    else
-      sprintf(classpath,"%s",ntmp);
+    }
     sprintf(oclasspath,"-Djava.class.path=%s",classpath);
   }
@@ -54 +53 @@
   fprintf(stderr,"(%s)\n",oclasspath);
 #endif
-  setenv("CLASSPATH",classpath,1);
 
   JavaVMOption options[1];