mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-28 16:01:10 +02:00
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
src/driver/rcinput.cpp
src/driver/rcinput.h
src/neutrino.cpp
Origin commit data
------------------
Commit: 134e499be0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
This commit is contained in:
@@ -1407,6 +1407,16 @@ 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 "";
|
||||
}
|
||||
|
||||
//NI
|
||||
// returns the pid of the first process found in /proc
|
||||
int getpidof(const char *process)
|
||||
|
Reference in New Issue
Block a user