zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-dlopen-libsensors-debian' of fasterit/htop

This commit is contained in:
Daniel Lange 2020-12-13 20:09:06 +01:00
parent 4b1a4a4ebd 12421f460a
commit f8a610e6e1
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
linux/LibSensors.c
View File

@ -21,9 +21,13 @@ static void* dlopenHandle = NULL;
int LibSensors_init(FILE* input) { int LibSensors_init(FILE* input) {
if (!dlopenHandle) { if (!dlopenHandle) {
dlopenHandle = dlopen("libsensors.so", RTLD_LAZY); dlopenHandle = dlopen("libsensors.so.", RTLD_LAZY);
if (!dlopenHandle) if (!dlopenHandle) {
goto dlfailure; /* Debian contains no unversioned .so in libsensors5, only in the -dev package, so work around that: */
dlopenHandle = dlopen("libsensors.so.5", RTLD_LAZY);
if (!dlopenHandle)
goto dlfailure;
}
/* Clear any errors */ /* Clear any errors */
dlerror(); dlerror();