mirror of
https://github.com/kiwix/kiwix-tools.git
synced 2025-09-24 04:20:56 -04:00
+ Beautification of the code
This commit is contained in:
kelson42
parent
4ca544960a
commit
5b3448c441
@ -1,3 +1,23 @@
|
||||
/*
|
||||
* Copyright 2012-2014
|
||||
* Renaud Gaudin <reg@kiwix.org>
|
||||
* Emmanuel Engelhart <kelson@kiwix.org>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 3 of the License, or
|
||||
* any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
||||
* MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
@ -6,86 +26,86 @@
|
||||
|
||||
using namespace std;
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
int main(int argc, char *argv[]) {
|
||||
|
||||
// find current binary path
|
||||
string progpath = getExecutablePath();
|
||||
string cwd = removeLastPathElement(progpath);
|
||||
string ld_path = computeAbsolutePath(cwd, "xulrunner");
|
||||
/* Initialisation of a few paths */
|
||||
string executablePath = getExecutablePath();
|
||||
string executableDirectory = removeLastPathElement(executablePath);
|
||||
string applicationIniPath = computeAbsolutePath(executableDirectory, "application.ini");
|
||||
|
||||
// retrieve existing env if exist.
|
||||
string previous_env;
|
||||
char *previous_env_buf = getenv("LD_LIBRARY_PATH");
|
||||
if (previous_env_buf == NULL)
|
||||
previous_env = "";
|
||||
else
|
||||
previous_env = string(previous_env_buf);
|
||||
/* Find xulrunner directory */
|
||||
string xulrunnerDirectory = computeAbsolutePath(executableDirectory, "xulrunner");
|
||||
if (!fileExists(xulrunnerDirectory)) {
|
||||
xulrunnerDirectory = computeAbsolutePath(executableDirectory, "kiwix");
|
||||
xulrunnerDirectory = computeAbsolutePath(executableDirectory, "xulrunner");
|
||||
if (!fileExists(xulrunnerDirectory)) {
|
||||
perror("Unable to find the xulrunner directory");
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
}
|
||||
|
||||
/* Find xulrunner binary path */
|
||||
string xulrunnerPath = computeAbsolutePath(xulrunnerDirectory, "xulrunner-bin");
|
||||
if (!fileExists(xulrunnerPath)) {
|
||||
xulrunnerPath = computeAbsolutePath(executableDirectory, "xulrunner");
|
||||
if (!fileExists(xulrunnerPath)) {
|
||||
perror("Unable to find neither the 'xulrunner-bin' nor the 'xulrunner' binary");
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
}
|
||||
|
||||
/* Debug prints */
|
||||
/*
|
||||
cout << "Executable directory (executableDirectory): " << executableDirectory << endl;
|
||||
cout << "Executable path (executablePath): " << executablePath << endl;
|
||||
cout << "Xulrunner directory (xulrunnerDirectory): " << xulrunnerDirectory << endl;
|
||||
cout << "Xulrunner path (xulrunnerPath): " << xulrunnerPath << endl;
|
||||
cout << "Application.ini path (applicationIniPath): " << applicationIniPath << endl;
|
||||
*/
|
||||
|
||||
/* Modify environnement variables */
|
||||
#ifdef _WIN32
|
||||
string sep = ";";
|
||||
#else
|
||||
string sep = ":";
|
||||
#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());
|
||||
|
||||
// generate putenv string
|
||||
string env_str = "LD_LIBRARY_PATH=" + ld_path + sep + previous_env;
|
||||
putenv((char *)env_str.c_str());
|
||||
|
||||
string xulrunner_path = computeAbsolutePath(cwd, "xulrunner/xulrunner-bin");
|
||||
string application_ini = computeAbsolutePath(cwd, "application.ini");
|
||||
|
||||
//debug prints
|
||||
/*
|
||||
cout << "CurProg: " << progpath << endl;
|
||||
cout << "cwd: " << cwd << endl;
|
||||
cout << "LD path: " << ld_path << endl;
|
||||
cout << "xulrunner_path: " << xulrunner_path << endl;
|
||||
cout << "application_ini: " << application_ini << endl;
|
||||
*/
|
||||
|
||||
// exist if xulrunner can't be found
|
||||
if (!fileExists(xulrunner_path)) {
|
||||
xulrunner_path = computeAbsolutePath(cwd, "xulrunner/xulrunner");
|
||||
if (!fileExists(xulrunner_path)) {
|
||||
perror("Unable to find neither the 'xulrunner-bin' nor the 'xulrunner' binary");
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
}
|
||||
|
||||
// execute xulrunner
|
||||
/* Launch xulrunner */
|
||||
if (argc == 0) {
|
||||
return execl(xulrunner_path.c_str(), xulrunner_path.c_str(), application_ini.c_str(),
|
||||
return execl(xulrunnerPath.c_str(), xulrunnerPath.c_str(), applicationIniPath.c_str(),
|
||||
"", NULL);
|
||||
} else if (argc == 1) {
|
||||
return execl(xulrunner_path.c_str(), xulrunner_path.c_str(), application_ini.c_str(),
|
||||
return execl(xulrunnerPath.c_str(), xulrunnerPath.c_str(), applicationIniPath.c_str(),
|
||||
argv[1], NULL);
|
||||
} else if (argc == 2) {
|
||||
return execl(xulrunner_path.c_str(), xulrunner_path.c_str(), application_ini.c_str(),
|
||||
return execl(xulrunnerPath.c_str(), xulrunnerPath.c_str(), applicationIniPath.c_str(),
|
||||
argv[1], argv[2], NULL);
|
||||
} else if (argc == 3) {
|
||||
return execl(xulrunner_path.c_str(), xulrunner_path.c_str(), application_ini.c_str(),
|
||||
return execl(xulrunnerPath.c_str(), xulrunnerPath.c_str(), applicationIniPath.c_str(),
|
||||
argv[1], argv[2], argv[3], NULL);
|
||||
} else if (argc == 4) {
|
||||
return execl(xulrunner_path.c_str(), xulrunner_path.c_str(), application_ini.c_str(),
|
||||
return execl(xulrunnerPath.c_str(), xulrunnerPath.c_str(), applicationIniPath.c_str(),
|
||||
argv[1], argv[2], argv[3], argv[4], NULL);
|
||||
} else if (argc == 5) {
|
||||
return execl(xulrunner_path.c_str(), xulrunner_path.c_str(), application_ini.c_str(),
|
||||
return execl(xulrunnerPath.c_str(), xulrunnerPath.c_str(), applicationIniPath.c_str(),
|
||||
argv[1], argv[2], argv[3], argv[4], argv[5], NULL);
|
||||
} else if (argc == 6) {
|
||||
return execl(xulrunner_path.c_str(), xulrunner_path.c_str(), application_ini.c_str(),
|
||||
return execl(xulrunnerPath.c_str(), xulrunnerPath.c_str(), applicationIniPath.c_str(),
|
||||
argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], NULL);
|
||||
} else if (argc == 7) {
|
||||
return execl(xulrunner_path.c_str(), xulrunner_path.c_str(), application_ini.c_str(),
|
||||
return execl(xulrunnerPath.c_str(), xulrunnerPath.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(xulrunner_path.c_str(), xulrunner_path.c_str(), application_ini.c_str(),
|
||||
return execl(xulrunnerPath.c_str(), xulrunnerPath.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) {
|
||||
if (argc > 9) {
|
||||
fprintf(stderr, "Kiwix was not able to forward all your arguments to the xulrunner binary.");
|
||||
}
|
||||
return execl(xulrunner_path.c_str(), xulrunner_path.c_str(), application_ini.c_str(),
|
||||
return execl(xulrunnerPath.c_str(), xulrunnerPath.c_str(), applicationIniPath.c_str(),
|
||||
argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], NULL);
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user