From 59a9d369aba04eb5c2c1f06027d6abb5af331234 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Thu, 28 Jul 2011 09:03:49 +0200 Subject: [PATCH] Bug 550659 - Resolve the xulrunner path when it is a symbolic link in the xulrunner stub. r=bsmedberg --- xulrunner/stub/nsXULStub.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/xulrunner/stub/nsXULStub.cpp b/xulrunner/stub/nsXULStub.cpp index 916b704de55..6620c08afce 100644 --- a/xulrunner/stub/nsXULStub.cpp +++ b/xulrunner/stub/nsXULStub.cpp @@ -314,6 +314,15 @@ main(int argc, char **argv) greFound = FolderExists(greDir); +#ifdef XP_UNIX + if (greFound) { + char resolved_greDir[MAXPATHLEN] = ""; + if (realpath(greDir, resolved_greDir) && *resolved_greDir) { + strncpy(greDir, resolved_greDir, MAXPATHLEN); + } + } +#endif + strncpy(lastSlash, "application.ini", sizeof(iniPath) - (lastSlash - iniPath)); #endif