Merge remote-tracking branch 'tuxbox/master'

Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c95139207
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit

src/system/helpers.cpp

@@ -1233,3 +1233,13 @@ std::string Lang2ISO639_1(std::string& lang)
 
 	return ret;
 }
+
+string readLink(string lnk)
+{
+	char buf[PATH_MAX];
+	memset(buf, 0, sizeof(buf)-1);
+	if (readlink(lnk.c_str(), buf, sizeof(buf)-1) != -1)
+		return (string)buf;
+
+	return "";
+}

src/system/helpers.h

@@ -147,5 +147,6 @@ bool split_config_string(const std::string &str, std::map<std::string,std::strin
 
 std::string getJFFS2MountPoint(int mtdPos);
 std::string Lang2ISO639_1(std::string& lang);
+std::string readLink(std::string lnk);
 
 #endif