From: twisti <none@none>
Date: Mon, 2 Aug 2004 22:33:03 +0000 (+0000)
Subject: Forget environment CLASSPATH if one is given with -classpath like sun and
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=fa08c950b95c5bc3ad9fefc8f4eb87a506e76921;p=cacao.git

Forget environment CLASSPATH if one is given with -classpath like sun and
gcj do (thanks to motse). TODO: set some type of bootclasspath
---

diff --git a/main.c b/main.c
index 55aa05650..e3158d84a 100644
--- a/main.c
+++ b/main.c
@@ -37,7 +37,7 @@
      - Calling the class loader
      - Running the main method
 
-   $Id: main.c 1371 2004-08-01 21:55:39Z stefan $
+   $Id: main.c 1390 2004-08-02 22:33:03Z twisti $
 
 */
 
@@ -350,6 +350,7 @@ int main(int argc, char **argv)
 
 	/************ Collect info from the environment ************************/
 
+	/* set an initial, minimal classpath */
 	classpath = MNEW(u1, 2);
 	strcpy(classpath, ".");
 
@@ -374,12 +375,12 @@ int main(int argc, char **argv)
 		case OPT_IGNORE: break;
 			
 		case OPT_CLASSPATH:
+			/* forget old classpath and set the argument as new classpath */
 			classpath = MREALLOC(classpath,
 								 u1,
 								 strlen(classpath),
-								 strlen(classpath) + 1 + strlen(opt_arg) + 1);
-			strcat(classpath, ":");
-			strncat(classpath, opt_arg, strlen(opt_arg));
+								 strlen(opt_arg) + 1);
+			strncpy(classpath, opt_arg, strlen(opt_arg));
 			break;
 				
 		case OPT_D:
diff --git a/src/cacao/cacao.c b/src/cacao/cacao.c
index 4290c34f7..1bc66028c 100644
--- a/src/cacao/cacao.c
+++ b/src/cacao/cacao.c
@@ -37,7 +37,7 @@
      - Calling the class loader
      - Running the main method
 
-   $Id: cacao.c 1371 2004-08-01 21:55:39Z stefan $
+   $Id: cacao.c 1390 2004-08-02 22:33:03Z twisti $
 
 */
 
@@ -350,6 +350,7 @@ int main(int argc, char **argv)
 
 	/************ Collect info from the environment ************************/
 
+	/* set an initial, minimal classpath */
 	classpath = MNEW(u1, 2);
 	strcpy(classpath, ".");
 
@@ -374,12 +375,12 @@ int main(int argc, char **argv)
 		case OPT_IGNORE: break;
 			
 		case OPT_CLASSPATH:
+			/* forget old classpath and set the argument as new classpath */
 			classpath = MREALLOC(classpath,
 								 u1,
 								 strlen(classpath),
-								 strlen(classpath) + 1 + strlen(opt_arg) + 1);
-			strcat(classpath, ":");
-			strncat(classpath, opt_arg, strlen(opt_arg));
+								 strlen(opt_arg) + 1);
+			strncpy(classpath, opt_arg, strlen(opt_arg));
 			break;
 				
 		case OPT_D: