kiwix/kiwix-tools
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-tools.git synced 2025-09-25 13:19:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression on Linux (post Windows port)

Browse Source
This commit is contained in:
Kelson42 2014-05-21 12:20:58 +02:00
parent 4efe775669
commit 909549c5bf
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/launcher/kiwix-launcher.cpp
View File

@ -88,7 +88,10 @@ int main(int argc, char *argv[]) {
}
/* Compute application.ini path */
string applicationIniPath = "\"" + computeAbsolutePath(removeLastPathElement(xulrunnerDirectory, false, false), "application.ini") + "\"";
string applicationIniPath = computeAbsolutePath(removeLastPathElement(xulrunnerDirectory, false, false), "application.ini");
#ifdef _WIN32
applicationIniPath = "\"" + applicationIniPath + "\"";
#endif
/* Debug prints */
/*
@ -102,46 +105,49 @@ int main(int argc, char *argv[]) {
/* Modify environnement variables */
#ifdef _WIN32
string sep = ";";
string execlArg0 = "kiwix-launcher.exe";
#else
string sep = ":";
string execlArg0 = xulrunnerPath.c_str();
#endif
string ldLibraryPath = getenv("LD_LIBRARY_PATH") == NULL ? "" : string(getenv("LD_LIBRARY_PATH"));
string putenvStr = "LD_LIBRARY_PATH=" + xulrunnerDirectory + sep + ldLibraryPath;
PUTENV((char *)putenvStr.c_str());
/* Launch xulrunner */
if (argc == 0) {
return EXECL(xulrunnerPath.c_str(), "kiwix-launcher", applicationIniPath.c_str(),
return EXECL(xulrunnerPath.c_str(), execlArg0.c_str(), applicationIniPath.c_str(),
"", NULL);
} else if (argc == 1) {
return EXECL(xulrunnerPath.c_str(), "kiwix-launcher", applicationIniPath.c_str(),
return EXECL(xulrunnerPath.c_str(), execlArg0.c_str(), applicationIniPath.c_str(),
argv[1], NULL);
} else if (argc == 2) {
return EXECL(xulrunnerPath.c_str(), "kiwix-launcher", applicationIniPath.c_str(),
return EXECL(xulrunnerPath.c_str(), execlArg0.c_str(), applicationIniPath.c_str(),
argv[1], argv[2], NULL);
} else if (argc == 3) {
return EXECL(xulrunnerPath.c_str(), "kiwix-launcher", applicationIniPath.c_str(),
return EXECL(xulrunnerPath.c_str(), execlArg0.c_str(), applicationIniPath.c_str(),
argv[1], argv[2], argv[3], NULL);
} else if (argc == 4) {
return EXECL(xulrunnerPath.c_str(), "kiwix-launcher", applicationIniPath.c_str(),
return EXECL(xulrunnerPath.c_str(), execlArg0.c_str(), applicationIniPath.c_str(),
argv[1], argv[2], argv[3], argv[4], NULL);
} else if (argc == 5) {
return EXECL(xulrunnerPath.c_str(), "kiwix-launcher", applicationIniPath.c_str(),
return EXECL(xulrunnerPath.c_str(), execlArg0.c_str(), applicationIniPath.c_str(),
argv[1], argv[2], argv[3], argv[4], argv[5], NULL);
} else if (argc == 6) {
return EXECL(xulrunnerPath.c_str(), "kiwix-launcher", applicationIniPath.c_str(),
return EXECL(xulrunnerPath.c_str(), execlArg0.c_str(), applicationIniPath.c_str(),
argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], NULL);
} else if (argc == 7) {
return EXECL(xulrunnerPath.c_str(), "kiwix-launcher", applicationIniPath.c_str(),
return EXECL(xulrunnerPath.c_str(), execlArg0.c_str(), applicationIniPath.c_str(),
argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], NULL);
} else if (argc == 8) {
return EXECL(xulrunnerPath.c_str(), "kiwix-launcher", applicationIniPath.c_str(),
return EXECL(xulrunnerPath.c_str(), execlArg0.c_str(), applicationIniPath.c_str(),
argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], NULL);
} else if (argc >= 9) {
if (argc > 9) {
fprintf(stderr, "Kiwix was not able to forward all your arguments to the xulrunner binary.");
}
return EXECL(xulrunnerPath.c_str(), "kiwix-launcher", applicationIniPath.c_str(),
return EXECL(xulrunnerPath.c_str(), execlArg0.c_str(), applicationIniPath.c_str(),
argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], NULL);
}
}