Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-26 04:17:33 +00:00
Code Issues Releases Activity

Fix hwmon location for kernel >= 2.6.31 (closes sf: #2865628)

Browse Source 
In the linux kernel 2.6.31 and above, device data can either be in
/sys/class/hwmon/hwmonDEV or /sys/class/hwmon/hwmonDEV/device.
Just stat'ing for the latter doesn't work since it can exist but not contain
the required data (see https://bugs.launchpad.net/bugs/435571 for details).
The patch could be improved to keep in memory the right location of the data
on the user's system instead of trying each time, but, is it worth doing it?
This commit is contained in:
Cesare Tirabassi 2009-11-01 18:37:48 +01:00
parent f7f3b37807
commit 4ea99e27f1
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/linux.c
View File

@ -844,7 +844,6 @@ static int open_sysfs_sensor(const char *dir, const char *dev, const char *type,
char buf[256]; char buf[256];
int fd; int fd;
int divfd; int divfd;
struct stat st;
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
@ -871,13 +870,6 @@ static int open_sysfs_sensor(const char *dir, const char *dev, const char *type,
} }
} }
/* At least the acpitz hwmon doesn't have a 'device' subdir,
* so check it's existence and strip it from buf otherwise. */
snprintf(path, 255, "%s%s", dir, dev);
if (stat(path, &st)) {
buf[strlen(buf) - 7] = 0;
}
/* change vol to in, tempf to temp */ /* change vol to in, tempf to temp */
if (strcmp(type, "vol") == 0) { if (strcmp(type, "vol") == 0) {
type = "in"; type = "in";
@ -885,15 +877,24 @@ static int open_sysfs_sensor(const char *dir, const char *dev, const char *type,
type = "temp"; type = "temp";
} }
/* construct path */
snprintf(path, 255, "%s%s/%s%d_input", dir, dev, type, n); snprintf(path, 255, "%s%s/%s%d_input", dir, dev, type, n);
strncpy(devtype, path, 255);
/* open file */ /* first, attempt to open file in /device */
fd = open(path, O_RDONLY);
if (fd < 0) {
/* if it fails, strip the /device from dev and attempt again */
buf[strlen(buf) - 7] = 0;
snprintf(path, 255, "%s%s/%s%d_input", dir, dev, type, n);
fd = open(path, O_RDONLY); fd = open(path, O_RDONLY);
if (fd < 0) { if (fd < 0) {
CRIT_ERR(NULL, NULL, "can't open '%s': %s\nplease check your device or remove this " CRIT_ERR(NULL, NULL, "can't open '%s': %s\nplease check your device or remove this "
"var from "PACKAGE_NAME, path, strerror(errno)); "var from "PACKAGE_NAME, path, strerror(errno));
} }
}
strncpy(devtype, path, 255);
if (strcmp(type, "in") == 0 || strcmp(type, "temp") == 0 if (strcmp(type, "in") == 0 || strcmp(type, "temp") == 0
|| strcmp(type, "tempf") == 0) { || strcmp(type, "tempf") == 0) {