Attachment #179323 for bug #325294

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




		/* startup jar was specified on the command line */
		ch = _tcsdup(startupArg);
		/* check path will check relative paths against programDir and workingDir */
		file = checkPath(ch, programDir, 1);
		if(file != ch)
			free(ch);
		/* check existence */

	
	/* old startup.jar? */
	ch = OLD_STARTUP;
	file = checkPath(ch, programDir, 1);
	if (_tstat( file, &stats ) == 0)
		return (file == ch) ? _tcsdup(ch) : file;
		

    		vmName[length - 1] = 0;
    	}
    	
    	vmName = checkPath(vmName, programDir, 1);
    	type = checkProvidedVMType(vmName);
    	switch (type) {
    	case VM_DIRECTORY:

Lines 56-62 Link Here

(-)library/eclipseMain.c (-2 / +2 lines)
56	static int initialArgc;	56	static int initialArgc;
57	static _TCHAR** initialArgv;	57	static _TCHAR** initialArgv;
58		58
59	_TCHAR* eclipseLibrary; /* path to the eclipse shared library */	59	_TCHAR* eclipseLibrary = NULL; /* path to the eclipse shared library */
60		60
61	#ifdef UNICODE	61	#ifdef UNICODE
62	extern int main(int, char**);	62	extern int main(int, char**);
Lines 397-403 Link Here
397	struct _stat stats;	397	struct _stat stats;
398		398
399	if (library != NULL) {	399	if (library != NULL) {
400	path = checkPath(library, programDir, 0);	400	path = checkPath(library, programDir, 1);
401	if (_tstat(path, &stats) == 0 && (stats.st_mode & S_IFDIR) != 0)	401	if (_tstat(path, &stats) == 0 && (stats.st_mode & S_IFDIR) != 0)
402	{	402	{
403	/* directory, find the highest version eclipse_* library */	403	/* directory, find the highest version eclipse_* library */

Return to bug 325294

Lines 1241-1247 Link Here

(-)library/eclipse.c (-3 / +3 lines)
1241	/* startup jar was specified on the command line */	1241	/* startup jar was specified on the command line */
1242	ch = _tcsdup(startupArg);	1242	ch = _tcsdup(startupArg);
1243	/* check path will check relative paths against programDir and workingDir */	1243	/* check path will check relative paths against programDir and workingDir */
1244	file = checkPath(ch, programDir, 0);	1244	file = checkPath(ch, programDir, 1);
1245	if(file != ch)	1245	if(file != ch)
1246	free(ch);	1246	free(ch);
1247	/* check existence */	1247	/* check existence */
Lines 1274-1280 Link Here
1274		1274
1275	/* old startup.jar? */	1275	/* old startup.jar? */
1276	ch = OLD_STARTUP;	1276	ch = OLD_STARTUP;
1277	file = checkPath(ch, programDir, 0);	1277	file = checkPath(ch, programDir, 1);
1278	if (_tstat( file, &stats ) == 0)	1278	if (_tstat( file, &stats ) == 0)
1279	return (file == ch) ? _tcsdup(ch) : file;	1279	return (file == ch) ? _tcsdup(ch) : file;
1280		1280
Lines 1431-1437 Link Here
1431	vmName[length - 1] = 0;	1431	vmName[length - 1] = 0;
1432	}	1432	}
1433		1433
1434	vmName = checkPath(vmName, programDir, 0);	1434	vmName = checkPath(vmName, programDir, 1);
1435	type = checkProvidedVMType(vmName);	1435	type = checkProvidedVMType(vmName);
1436	switch (type) {	1436	switch (type) {
1437	case VM_DIRECTORY:	1437	case VM_DIRECTORY: