From 7c1af3a03b9c51eafe318ec1116f298105f16b09 Mon Sep 17 00:00:00 2001
From: Paul Cercueil <paul@crapouillou.net>
Date: Thu, 5 Dec 2013 23:32:15 +0100
Subject: [PATCH] Use 'opkrun' to execute OPK files

---
 src/linkapp.cpp | 33 ++++++---------------------------
 src/linkapp.h   |  5 +++--
 src/menu.cpp    |  5 +++--
 3 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/src/linkapp.cpp b/src/linkapp.cpp
index a948ad0..3580486 100644
--- a/src/linkapp.cpp
+++ b/src/linkapp.cpp
@@ -57,7 +57,8 @@ using namespace std;
 static const char *tokens[] = { "%f", "%F", "%u", "%U", };
 
 #ifdef HAVE_LIBOPK
-LinkApp::LinkApp(GMenu2X *gmenu2x_, const char* linkfile, struct OPK *opk)
+LinkApp::LinkApp(GMenu2X *gmenu2x_, const char* linkfile,
+			struct OPK *opk, const char *metadata_)
 #else
 LinkApp::LinkApp(GMenu2X *gmenu2x_, const char* linkfile)
 #endif
@@ -80,12 +81,14 @@ LinkApp::LinkApp(GMenu2X *gmenu2x_, const char* linkfile)
 
 #ifdef HAVE_LIBOPK
 	isOPK = !!opk;
+
 	if (isOPK) {
 		string::size_type pos;
 		const char *key, *val;
 		size_t lkey, lval;
 		int ret;
 
+		metadata.assign(metadata_);
 		opkFile = file;
 		pos = file.rfind('/');
 		opkMount = file.substr(pos+1);
@@ -553,27 +556,7 @@ void LinkApp::launch(const string &selectedFile) {
 
 	if (isOpk()) {
 #ifdef HAVE_LIBOPK
-		int err;
-
-		/* To be sure... */
-		string cmd = "umount " + opkMount;
-		system(cmd.c_str());
-
-		mkdir(opkMount.c_str(), 0700);
-		cmd = "mount -o loop,nosuid,ro " + opkFile + ' ' + opkMount;
-		err = system(cmd.c_str());
-
-		if (err) {
-			ERROR("Unable to mount OPK\n");
-			return;
-		}
-
-		chdir(opkMount.c_str());
-		if (exec[0] != '/') {
-			string tmp = opkMount + exec.substr(0, exec.find(" "));
-			if (fileExists(tmp))
-				exec = opkMount + exec;
-		}
+		exec = "/usr/bin/opkrun -m " + metadata + " " + opkFile;
 #endif
 	} else {
 		//Set correct working directory
@@ -604,7 +587,7 @@ void LinkApp::launch(const string &selectedFile) {
 	INFO("Executing '%s' (%s %s)\n", title.c_str(), exec.c_str(), params.c_str());
 
 	//check if we have to quit
-	string command = cmdclean(exec);
+	string command = exec;
 
 	if (!params.empty()) command += " " + params;
 #if defined(PLATFORM_A320) || defined(PLATFORM_GCW0)
@@ -614,10 +597,6 @@ void LinkApp::launch(const string &selectedFile) {
 	if (gmenu2x->confInt["outputLogs"])
 		command += " &> " LOG_FILE;
 #endif
-#ifdef HAVE_LIBOPK
-	if (isOPK)
-		command += " ; umount -l " + opkMount;
-#endif
 
 	gmenu2x->saveSelection();
 
diff --git a/src/linkapp.h b/src/linkapp.h
index a49f4c0..b036845 100644
--- a/src/linkapp.h
+++ b/src/linkapp.h
@@ -45,7 +45,7 @@ private:
 	bool dontleave;
 #ifdef HAVE_LIBOPK
 	bool isOPK;
-	std::string opkMount, opkFile, category;
+	std::string opkMount, opkFile, category, metadata;
 #endif
 
 	void start();
@@ -59,7 +59,8 @@ public:
 	bool isOpk() { return isOPK; }
 	const std::string &getOpkFile() { return opkFile; }
 
-	LinkApp(GMenu2X *gmenu2x, const char* linkfile, struct OPK *opk = NULL);
+	LinkApp(GMenu2X *gmenu2x, const char* linkfile,
+				struct OPK *opk = NULL, const char *metadata = NULL);
 #else
 	LinkApp(GMenu2X *gmenu2x, const char* linkfile);
 	bool isOpk() { return false; }
diff --git a/src/menu.cpp b/src/menu.cpp
index ebeca59..800c9b8 100644
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -26,6 +26,7 @@
 #include <math.h>
 #include <fstream>
 #include <unistd.h>
+#include <ini.h>
 
 #ifdef HAVE_LIBOPK
 #include <opk.h>
@@ -674,11 +675,11 @@ void Menu::openPackage(std::string path, bool order)
 	for (;;) {
 		unsigned int i;
 		bool has_metadata = false;
+		const char *name;
 		LinkApp *link;
 
 		for (;;) {
 			string::size_type pos;
-			const char *name;
 			int ret = opk_open_metadata(opk, &name);
 			if (ret < 0) {
 				ERROR("Error while loading meta-data\n");
@@ -704,7 +705,7 @@ void Menu::openPackage(std::string path, bool order)
 		if (!has_metadata)
 		  break;
 
-		link = new LinkApp(gmenu2x, path.c_str(), opk);
+		link = new LinkApp(gmenu2x, path.c_str(), opk, name);
 		link->setSize(gmenu2x->skinConfInt["linkWidth"], gmenu2x->skinConfInt["linkHeight"]);
 
 		addSection(link->getCategory());