From 879d60c88e24c2c3f2aab9dff73192c901f63f31 Mon Sep 17 00:00:00 2001
From: Andreas Oberritter <obi@opendreambox.org>
Date: Thu, 28 Oct 2010 20:29:01 +0200
Subject: use eEnv::resolve() / eEnv.resolve()

---
 main/bsod.cpp       | 16 ++++++----------
 main/enigma-gdi.cpp |  3 ++-
 main/enigma-gui.cpp |  2 +-
 main/enigma.cpp     | 17 ++++++++++-------
 4 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'main')

diff --git a/main/bsod.cpp b/main/bsod.cpp
index 68b5d571..c0362832 100755
--- a/main/bsod.cpp
+++ b/main/bsod.cpp
@@ -2,6 +2,7 @@
 #include <signal.h>
 #include <asm/ptrace.h>
 
+#include <lib/base/eenv.h>
 #include <lib/base/eerror.h>
 #include <lib/base/smartptr.h>
 #include <lib/base/nconfig.h>
@@ -65,7 +66,7 @@ static void addToLogbuffer(int level, const std::string &log)
 
 static std::string getConfigFileValue(const char *entry)
 {
-	std::string configfile = "/etc/enigma2/settings";
+	std::string configfile = eEnv::resolve("${sysconfdir}/enigma2/settings");
 	std::string configvalue;
 	if (entry)
 	{
@@ -140,8 +141,8 @@ static std::string getFileContent(const char *file)
 	return filecontent;
 }
 
-static std::string execCommand(char* cmd) {
-	FILE* pipe = popen(cmd, "r");
+static std::string execCommand(std::string cmd) {
+	FILE* pipe = popen(cmd.c_str(), "r");
 	if (!pipe)
 		return "Error";
 	char buffer[STDBUFFER_SIZE];
@@ -156,11 +157,6 @@ static std::string execCommand(char* cmd) {
 	return result;
 }
 
-extern std::string execCommand();
-extern std::string getConfigFileValue();
-extern std::string getFileContent();
-extern std::string getLogBuffer();
-
 #define INFOFILE "/maintainer.info"
 
 void bsodFatal(const char *component)
@@ -274,7 +270,7 @@ void bsodFatal(const char *component)
 					dreamboxca[strlen(dreamboxca)-1] = 0;
 				fprintf(f, "\t\t<dreamboxca>\n\t\t<![CDATA[\n%s\n\t\t]]>\n\t\t</dreamboxca>\n", dreamboxca);
 			}
-			std::string settings = getFileContent("/etc/enigma2/settings");
+			std::string settings = getFileContent(eEnv::resolve("${sysconfdir}/enigma2/settings").c_str());
 			if (settings != "Error")
 			{
 				fprintf(f, "\t\t<enigma2settings>\n\t\t<![CDATA[\n%s\t\t]]>\n\t\t</enigma2settings>\n", settings.c_str());
@@ -336,7 +332,7 @@ void bsodFatal(const char *component)
 		fprintf(f, "\t<crashlogs>\n");
 		std::string buffer = getLogBuffer();
 		fprintf(f, "\t\t<enigma2crashlog>\n\t\t<![CDATA[\n%s\t\t]]>\n\t\t</enigma2crashlog>\n", buffer.c_str());
-		std::string pythonmd5 = execCommand("find /usr/lib/enigma2/python/ -name \"*.py\" | xargs md5sum");
+		std::string pythonmd5 = execCommand("find " + eEnv::resolve("${libdir}/enigma2/python/") + " -name \"*.py\" | xargs md5sum");
 		fprintf(f, "\t\t<pythonMD5sum>\n\t\t<![CDATA[\n%s\t\t]]>\n\t\t</pythonMD5sum>\n", pythonmd5.c_str());
 		fprintf(f, "\t</crashlogs>\n");
 
diff --git a/main/enigma-gdi.cpp b/main/enigma-gdi.cpp
index 144e2d3a..328fba44 100644
--- a/main/enigma-gdi.cpp
+++ b/main/enigma-gdi.cpp
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <libsig_comp.h>
 #include <lib/base/ebase.h>
+#include <lib/base/eenv.h>
 #include <lib/base/eerror.h>
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
@@ -67,7 +68,7 @@ int main()
 		pal[a | 0x10] = (0x111111 * a) | 0xFF;
 	p.setPalette(pal, 0, 256);
 
-	fontRenderClass::getInstance()->AddFont(FONTDIR "/arial.ttf", "Regular", 100);
+	fontRenderClass::getInstance()->AddFont(eEnv::resolve("${datadir}/fonts/arial.ttf"), "Regular", 100);
 
 	p.resetClip(gRegion(eRect(0, 0, 720, 576)));
 	
diff --git a/main/enigma-gui.cpp b/main/enigma-gui.cpp
index e53fccab..2ba61067 100644
--- a/main/enigma-gui.cpp
+++ b/main/enigma-gui.cpp
@@ -67,7 +67,7 @@ int main()
 		pal[a | 0x10] = (0x111111 * a) | 0xFF;
 	p.setPalette(pal, 0, 256);
 
-	fontRenderClass::getInstance()->AddFont(FONTDIR "/arial.ttf", "Regular", 100);
+	fontRenderClass::getInstance()->AddFont(eEnv::resolve("${datadir}/fonts/arial.ttf"), "Regular", 100);
 
 	eWidgetDesktop dsk(eSize(720, 576));
 	dsk.setDC(my_dc);
diff --git a/main/enigma.cpp b/main/enigma.cpp
index b3364679..882af996 100644
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -9,6 +9,7 @@
 #include <lib/driver/rc.h>
 #include <lib/base/ioprio.h>
 #include <lib/base/ebase.h>
+#include <lib/base/eenv.h>
 #include <lib/base/eerror.h>
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
@@ -136,7 +137,7 @@ int main(int argc, char **argv)
 	gst_init(&argc, &argv);
 
 	// set pythonpath if unset
-	setenv("PYTHONPATH", LIBDIR "/enigma2/python", 0);
+	setenv("PYTHONPATH", eEnv::resolve("${libdir}/enigma2/python").c_str(), 0);
 	printf("PYTHONPATH: %s\n", getenv("PYTHONPATH"));
 	
 	bsodLogInit();
@@ -186,7 +187,7 @@ int main(int argc, char **argv)
 	dsk_lcd.setDC(my_lcd_dc);
 
 	ePtr<gPixmap> m_pm;
-	loadPNG(m_pm, DATADIR "/enigma2/skin_default/pal.png");
+	loadPNG(m_pm, eEnv::resolve("${datadir}/enigma2/skin_default/pal.png").c_str());
 	if (!m_pm)
 	{
 		eFatal("pal.png not found!");
@@ -209,14 +210,16 @@ int main(int argc, char **argv)
 		ePtr<gPixmap> wait[MAX_SPINNER];
 		for (i=0; i<MAX_SPINNER; ++i)
 		{
-			char filename[strlen(DATADIR) + 41];
-			sprintf(filename, DATADIR "/enigma2/skin_default/spinner/wait%d.png", i + 1);
-			loadPNG(wait[i], filename);
+			char filename[64];
+			std::string rfilename;
+			snprintf(filename, sizeof(filename), "${datadir}/enigma2/skin_default/spinner/wait%d.png", i + 1);
+			rfilename = eEnv::resolve(filename);
+			loadPNG(wait[i], rfilename.c_str());
 			
 			if (!wait[i])
 			{
 				if (!i)
-					eDebug("failed to load %s! (%m)", filename);
+					eDebug("failed to load %s! (%m)", rfilename.c_str());
 				else
 					eDebug("found %d spinner!\n", i);
 				break;
@@ -239,7 +242,7 @@ int main(int argc, char **argv)
 	setIoPrio(IOPRIO_CLASS_BE, 3);
 
 //	python.execute("mytest", "__main__");
-	python.execFile("/usr/lib/enigma2/python/mytest.py");
+	python.execFile(eEnv::resolve("${libdir}/enigma2/python/mytest.py").c_str());
 
 	extern void setFullsize(); // definend in lib/gui/evideo.cpp
 	setFullsize();
-- 
cgit v1.2.3