Attachment 179323 Details for Bug 325294 – Patch v2

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

[patch] Patch v2

325294.txt (text/plain), 2.13 KB, created by Andrew Niefer

on 2010-09-21 11:18:02 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Niefer

Created: 2010-09-21 11:18:02 EDT

Size: 2.13 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.executable
>Index: library/eclipse.c
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/framework/bundles/org.eclipse.equinox.executable/library/eclipse.c,v
>retrieving revision 1.75
>diff -u -r1.75 eclipse.c
>--- library/eclipse.c	17 Aug 2010 20:36:50 -0000	1.75
>+++ library/eclipse.c	21 Sep 2010 15:10:30 -0000
>@@ -1241,7 +1241,7 @@
> 		/* 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, 0);
>+		file = checkPath(ch, programDir, 1);
> 		if(file != ch)
> 			free(ch);
> 		/* check existence */
>@@ -1274,7 +1274,7 @@
> 	
> 	/* old startup.jar? */
> 	ch = OLD_STARTUP;
>-	file = checkPath(ch, programDir, 0);
>+	file = checkPath(ch, programDir, 1);
> 	if (_tstat( file, &stats ) == 0)
> 		return (file == ch) ? _tcsdup(ch) : file;
> 		
>@@ -1431,7 +1431,7 @@
>     		vmName[length - 1] = 0;
>     	}
>     	
>-    	vmName = checkPath(vmName, programDir, 0);
>+    	vmName = checkPath(vmName, programDir, 1);
>     	type = checkProvidedVMType(vmName);
>     	switch (type) {
>     	case VM_DIRECTORY:
>Index: library/eclipseMain.c
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/framework/bundles/org.eclipse.equinox.executable/library/eclipseMain.c,v
>retrieving revision 1.29
>diff -u -r1.29 eclipseMain.c
>--- library/eclipseMain.c	17 Aug 2010 19:44:52 -0000	1.29
>+++ library/eclipseMain.c	21 Sep 2010 15:10:30 -0000
>@@ -56,7 +56,7 @@
> static int initialArgc;
> static _TCHAR** initialArgv;
> 
>-_TCHAR* eclipseLibrary; /* path to the eclipse shared library */
>+_TCHAR* eclipseLibrary = NULL; /* path to the eclipse shared library */
> 
> #ifdef UNICODE
> extern int main(int, char**);
>@@ -397,7 +397,7 @@
> 	struct _stat stats;
> 	
> 	if (library != NULL) {
>-		path = checkPath(library, programDir, 0);
>+		path = checkPath(library, programDir, 1);
> 		if (_tstat(path, &stats) == 0 && (stats.st_mode & S_IFDIR) != 0) 
>         {
>             /* directory, find the highest version eclipse_* library */

Actions: View | Diff

Attachments on bug 325294: 178881 | 179323