diff options
| -rw-r--r-- | bundles/org.eclipse.equinox.executable/library/eclipse.c | 6 | ||||
| -rw-r--r-- | bundles/org.eclipse.equinox.executable/library/eclipseMain.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/eclipse.c b/bundles/org.eclipse.equinox.executable/library/eclipse.c index bec693c48..a657d643a 100644 --- a/bundles/org.eclipse.equinox.executable/library/eclipse.c +++ b/bundles/org.eclipse.equinox.executable/library/eclipse.c @@ -1183,7 +1183,7 @@ static _TCHAR* findStartupJar(){ /* 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 */ @@ -1216,7 +1216,7 @@ static _TCHAR* findStartupJar(){ /* 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; @@ -1373,7 +1373,7 @@ static int determineVM(_TCHAR** msg) { vmName[length - 1] = 0; } - vmName = checkPath(vmName, programDir, 0); + vmName = checkPath(vmName, programDir, 1); type = checkProvidedVMType(vmName); switch (type) { case VM_DIRECTORY: diff --git a/bundles/org.eclipse.equinox.executable/library/eclipseMain.c b/bundles/org.eclipse.equinox.executable/library/eclipseMain.c index 3e9c13d6a..fe5273072 100644 --- a/bundles/org.eclipse.equinox.executable/library/eclipseMain.c +++ b/bundles/org.eclipse.equinox.executable/library/eclipseMain.c @@ -56,7 +56,7 @@ static _TCHAR* checkForIni(int argc, _TCHAR* argv[]); 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**); @@ -396,7 +396,7 @@ static _TCHAR* findLibrary(_TCHAR* library, _TCHAR* program) 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 */ |