wt/lm-sensors
1
0 Fork 0
mirror of https://github.com/lm-sensors/lm-sensors.git synced 2026-10-18 11:09:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not attempt to read label files from procfs, they do not exist

Browse Source 
there.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4792 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare committed 2007-09-09 15:47:08 +00:00
1 parent 44b77f38e4
commit 0ce944ad66
1 file changed
+18 -14
Download Patch File Download Diff File Expand all files Collapse all files
lib/access.c
+18 -14
View File
@@ -27,6 +27,7 @@
#include "error.h"
#include "proc.h"
#include "general.h"
#include "sysfs.h"
static int sensors_do_this_chip_sets(sensors_chip_name name);
@@ -149,8 +150,6 @@ int sensors_get_label(sensors_chip_name name, int feature, char **result)
{
const sensors_chip *chip;
const sensors_chip_feature *featureptr;
char buf[128], path[PATH_MAX];
FILE *f;
int i;
*result = NULL;
@@ -166,18 +165,23 @@ int sensors_get_label(sensors_chip_name name, int feature, char **result)
goto sensors_get_label_exit;
}
/* No user specified label, check for a _label sysfs file */
snprintf(path, PATH_MAX, "%s/%s_label", name.busname,
featureptr->data.name);
if ((f = fopen(path, "r"))) {
i = fread(buf, 1, sizeof(buf) - 1, f);
fclose(f);
if (i > 0) {
/* i - 1 to strip the '\n' at the end */
buf[i - 1] = 0;
*result = strdup(buf);
goto sensors_get_label_exit;
if (sensors_found_sysfs) {
char buf[128], path[PATH_MAX];
FILE *f;
/* No user specified label, check for a _label sysfs file */
snprintf(path, PATH_MAX, "%s/%s_label", name.busname,
featureptr->data.name);
if ((f = fopen(path, "r"))) {
i = fread(buf, 1, sizeof(buf) - 1, f);
fclose(f);
if (i > 0) {
/* i - 1 to strip the '\n' at the end */
buf[i - 1] = 0;
*result = strdup(buf);
goto sensors_get_label_exit;
}
}
}