Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Niefer2010-10-04 14:30:16 -0400
committerAndrew Niefer2010-10-04 14:30:16 -0400
commit6ecf3f9b6622bbf2d7df6477359b26cc1ab87076 (patch)
tree5012f85a7022bf3c03dfa7f579f709421c6f24e2
parentb82158ce22cb82552765025e2033b92d05c5b582 (diff)
downloadrt.equinox.framework-6ecf3f9b6622bbf2d7df6477359b26cc1ab87076.tar.gz
rt.equinox.framework-6ecf3f9b6622bbf2d7df6477359b26cc1ab87076.tar.xz
rt.equinox.framework-6ecf3f9b6622bbf2d7df6477359b26cc1ab87076.zip
bug 325294 - check program dir before working dir
-rw-r--r--bundles/org.eclipse.equinox.executable/library/eclipse.c6
-rw-r--r--bundles/org.eclipse.equinox.executable/library/eclipseMain.c4
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 ca2a06458..65c0c26ef 100644
--- a/bundles/org.eclipse.equinox.executable/library/eclipse.c
+++ b/bundles/org.eclipse.equinox.executable/library/eclipse.c
@@ -1241,7 +1241,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 */
@@ -1274,7 +1274,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;
@@ -1431,7 +1431,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 1b62c6eec..657252e02 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**);
@@ -397,7 +397,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 */

Back to the top