Project: RJB

Revision: 71

Author: arton

Date: 26 May 2008 09:22:19

• /trunk/ext/load.c

  ......	@@ -47,6 +47,9 @@
  47	47	#define JVMDLL "%s/Libraries/libjvm_compat.dylib"
  48	48	#define DIRSEPARATOR '/'
  49	49	#define CLASSPATH_SEP ':'
  	50	#define HOME_NAME "/Home"
  	51	#define HOME_NAME_LEN strlen(HOME_NAME)
  	52	#define DEFAULT_HOME "/System/Library/Frameworks/JavaVM.framework"
  50	53	#else /* defined(_WIN32) || defined(__CYGWIN__) */
  51	54	#if defined(__sparc_v9__)
  52	55	#define ARCH "sparcv9"
  ......	@@ -90,7 +93,18 @@
  90	93	#if defined(__APPLE__) && defined(__MACH__)
  91	94	if (!jh)
  92	95	{
  93		jh = "/System/Library/Frameworks/JavaVM.framework";
  	96	jh = DEFAULT_HOME;
  	97	}
  	98	else
  	99	{
  	100	if (strlen(jh) > HOME_NAME_LEN
  	101	&& strcasecmp(jh + strlen(jh) - HOME_NAME_LEN, HOME_NAME) == 0)
  	102	{
  	103	char* p = ALLOCA_N(char, strlen(jh));
  	104	strncpy(p, jh, strlen(jh) - 5);
  	105	*(p + strlen(jh) - 5) = 0;
  	106	jh = p;
  	107	}
  94	108	}
  95	109	#endif
  96	110	if (!jh)