Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: properties.c 8402 2007-08-22 19:32:27Z twisti $
+ $Id: properties.c 8403 2007-08-22 19:59:32Z twisti $
*/
boot_class_path = MNEW(char, len);
- strcat(boot_class_path, CLASSPATH_CLASSES);
+ strcpy(boot_class_path, CLASSPATH_CLASSES);
# else
# error unknown classpath configuration
#endif
}
- properties_add("java.boot.class.path", boot_class_path);
properties_add("sun.boot.class.path", boot_class_path);
+ properties_add("java.boot.class.path", boot_class_path);
#if defined(ENABLE_JAVASE)
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: vm.c 8401 2007-08-22 18:45:31Z twisti $
+ $Id: vm.c 8403 2007-08-22 19:59:32Z twisti $
*/
class_path = properties_get("java.class.path");
- MFREE(class_path, char, len);
-
p = MNEW(char, strlen(opt_arg) + strlen("0"));
strcpy(p, opt_arg);
#if defined(ENABLE_JAVASE)
properties_add("java.class.path", p);
#endif
+
+ MFREE(class_path, char, strlen(class_path));
break;
case OPT_D:
boot_class_path = properties_get("sun.boot.class.path");
- MFREE(boot_class_path, char, len);
-
p = MNEW(char, strlen(opt_arg) + strlen("0"));
strcpy(p, opt_arg);
properties_add("sun.boot.class.path", p);
properties_add("java.boot.class.path", p);
#endif
+
+ MFREE(boot_class_path, char, strlen(boot_class_path));
break;
case OPT_BOOTCLASSPATH_A:
strcat(p, ":");
strcat(p, boot_class_path);
- MFREE(boot_class_path, char, len);
-
#if defined(ENABLE_JAVASE)
properties_add("sun.boot.class.path", p);
properties_add("java.boot.class.path", p);
#endif
+
+ MFREE(boot_class_path, char, len);
break;
case OPT_BOOTCLASSPATH_C:
boot_class_path = properties_get("sun.boot.class.path");
- MFREE(boot_class_path, char, strlen(boot_class_path));
-
len =
strlen(CACAO_VM_ZIP) +
strlen(":") +
properties_add("sun.boot.class.path", p);
properties_add("java.boot.class.path", p);
#endif
+
+ MFREE(boot_class_path, char, strlen(boot_class_path));
break;
#if defined(ENABLE_JVMTI)
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: suck.c 8399 2007-08-22 18:24:23Z twisti $
+ $Id: suck.c 8403 2007-08-22 19:59:32Z twisti $
*/
strcat(p, ":");
strcat(p, boot_class_path);
- MFREE(boot_class_path, u1, strlen(boot_class_path));
-
#if defined(ENABLE_JAVASE)
properties_add("sun.boot.class.path", p);
properties_add("java.boot.class.path", p);
#endif
+ MFREE(boot_class_path, char, strlen(boot_class_path));
+
/* free the memory allocated by scandir */
/* (We use `free` as the memory came from the C library.) */