From: twisti <none@none>
Date: Mon, 13 Mar 2006 11:35:26 +0000 (+0000)
Subject: * src/vm/vm.c (vm_create): Only put .jar file into classpath. Fixes
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=2bf1d6cda727525a462443259f219bd437e4b4fa;p=cacao.git

* src/vm/vm.c (vm_create): Only put .jar file into classpath. Fixes
startup bug with knopflerfish.
---

diff --git a/src/vm/vm.c b/src/vm/vm.c
index e4148457e..a63223b49 100644
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -958,31 +958,25 @@ bool vm_create(JavaVMInitArgs *vm_args)
 	if (opt_index < vm_args->nOptions) {
 		mainstring = vm_args->options[opt_index++].optionString;
 
-		if (opt_jar == true) {
+		/* Put the jar file into the classpath (if any). */
 
-			/* prepend the jar file to the classpath (if any) */
+		if (opt_jar == true) {
+			/* free old classpath */
 
-			if (opt_jar == true) {
-				/* put jarfile in classpath */
+			MFREE(classpath, char, strlen(classpath));
 
-				cp = classpath;
+			/* put jarfile into classpath */
 
-				classpath = MNEW(char, strlen(mainstring) + strlen(":") +
-								 strlen(classpath) + strlen("0"));
+			classpath = MNEW(char, strlen(mainstring) + strlen("0"));
 
-				strcpy(classpath, mainstring);
-				strcat(classpath, ":");
-				strcat(classpath, cp);
+			strcpy(classpath, mainstring);
 		
-				MFREE(cp, char, strlen(cp));
+		} else {
+			/* replace .'s with /'s in classname */
 
-			} else {
-				/* replace .'s with /'s in classname */
-
-				for (i = strlen(mainstring) - 1; i >= 0; i--)
-					if (mainstring[i] == '.')
-						mainstring[i] = '/';
-			}
+			for (i = strlen(mainstring) - 1; i >= 0; i--)
+				if (mainstring[i] == '.')
+					mainstring[i] = '/';
 		}
 	}