diff --git a/lib/init.c b/lib/init.c index 170dbde3..156d83f8 100644 --- a/lib/init.c +++ b/lib/init.c @@ -41,13 +41,11 @@ int sensors_init(FILE *input) { int res; sensors_cleanup(); - if ((res = sensors_read_proc_chips())) - return res; if (sensors_init_sysfs()) { - if ((res = sensors_read_sysfs_bus())) + if ((res = sensors_read_sysfs_chips()) || (res = sensors_read_sysfs_bus())) return res; } else { - if ((res = sensors_read_proc_bus())) + if ((res = sensors_read_proc_chips()) || (res = sensors_read_proc_bus())) return res; } sensors_yyin = input; diff --git a/lib/proc.c b/lib/proc.c index 8315c02e..e9952d51 100644 --- a/lib/proc.c +++ b/lib/proc.c @@ -46,151 +46,16 @@ static int sensors_get_chip_id(sensors_chip_name name); static int getsysname(const sensors_chip_feature *feature, char *sysname, int *sysmag, char *altsysname); -/* return value: <0 on error, 0 if chip is ignored, 1 if chip is added - Warning: name is overwritten */ -static int sensors_read_one_sysfs_chip(char *name, char *dirname, char *id) -{ - FILE *f; - char x[51]; - int len; - sensors_proc_chips_entry entry; - - if ((f = fopen(name, "r")) == NULL) - return -SENSORS_ERR_PROC; - - if (fscanf(f, "%50[a-zA-z0-9_ ]%n", x, &len) != 1) { - fclose(f); - return -SENSORS_ERR_CHIP_NAME; - } - fclose(f); - - /* We don't care about subclients */ - if (len >= 10 && !strcmp(x + len - 10, " subclient")) - return 0; - - /* also, ignore eeproms for all 2.6.x kernels */ - if (!strcmp(x, "eeprom")) - return 0; - - /* Fill in the entry fields */ - entry.name.prefix = strdup(x); - if (entry.name.prefix == NULL) - return -SENSORS_ERR_PARSE; /* No better error :( */ - entry.name.busname = strdup(dirname); - if (entry.name.prefix == NULL) - return -SENSORS_ERR_PARSE; /* No better error :( */ - sscanf(id, "%d-%x", &entry.name.bus, &entry.name.addr); - - /* Find out if ISA or not */ - sprintf(name, "%s/class/i2c-adapter/i2c-%d/device/name", - sensors_sysfs_mount, entry.name.bus); - if ((f = fopen(name, "r")) != NULL) { - if (fgets(x, 5, f) != NULL - && !strncmp(x, "ISA ", 4)) - entry.name.bus = SENSORS_CHIP_NAME_BUS_ISA; - fclose(f); - } - - sensors_add_proc_chips(&entry); - - return 1; -} - /* This reads /proc/sys/dev/sensors/chips into memory */ int sensors_read_proc_chips(void) { - struct dirent *de; - DIR *dir; - char sysfs[NAME_MAX], n[NAME_MAX]; - char dirname[NAME_MAX]; - int res; + int res; - int name[3] = { CTL_DEV, DEV_SENSORS, SENSORS_CHIPS }; - int buflen = BUF_LEN; - char *bufptr = buf; - sensors_proc_chips_entry entry; - int lineno; - - if (!sensors_found_sysfs) - goto proc; - - /* Try /sys/class/hwmon first (Linux 2.6.14 and up) */ - strncpy(sysfs, sensors_sysfs_mount, sizeof(sysfs) - 1); - sysfs[sizeof(sysfs) - 1] = '\0'; - strncat(sysfs, "/class/hwmon", sizeof(sysfs) - strlen(sysfs) - 1); - - dir = opendir(sysfs); - if (! dir) - goto oldsys; - - while ((de = readdir(dir)) != NULL) { - char lnk[NAME_MAX]; - char *id; - - if (de->d_name[0] == '.') - continue; - - sprintf(n, "%s/%s", sysfs, de->d_name); - strcpy(dirname, n); - strcat(n, "/device"); - if ((res = readlink(n, lnk, NAME_MAX)) < 0) - continue; - lnk[res] = '\0'; - - if (lnk[0] == '/') /* absolute link (unlikely) */ - strcpy(n, lnk); - else if (strncmp(lnk, "../", 3)) /* simple relative link */ - sprintf(n, "%s/%s/%s", sysfs, de->d_name, lnk); - else { /* relative link with ../s, can be simplified */ - char *p_lnk = lnk + 3; - int l = strlen(sysfs) - 1; - while (!strncmp(p_lnk, "../", 3)) { - p_lnk += 3; - while (l && sysfs[--l] != '/') ; - } - strncpy(n, sysfs, ++l); - strcpy(n + l, p_lnk); - } - strcpy(dirname, n); - id = rindex(n, '/'); - id++; - strcat(n, "/name"); - - sensors_read_one_sysfs_chip(n, dirname, id); - } - closedir(dir); - return 0; - -oldsys: - /* Fall back to /sys/bus/i2c (Linux 2.5 to 2.6.13) */ - strncpy(sysfs, sensors_sysfs_mount, sizeof(sysfs) - 1); - sysfs[sizeof(sysfs) - 1] = '\0'; - strncat(sysfs, "/bus/i2c/devices", sizeof(sysfs) - strlen(sysfs) - 1); - - dir = opendir(sysfs); - if (! dir) - goto proc; - - while ((de = readdir(dir)) != NULL) { - if (!strcmp(de->d_name, ".")) - continue; - if (!strcmp(de->d_name, "..")) - continue; -/* - if (de->d_type != DT_DIR && de->d_type != DT_LNK) - continue; -*/ - - sprintf(n, "%s/%s", sysfs, de->d_name); - strcpy(dirname, n); - strcat(n, "/name"); - - sensors_read_one_sysfs_chip(n, dirname, de->d_name); - } - closedir(dir); - return 0; - -proc: + int name[3] = { CTL_DEV, DEV_SENSORS, SENSORS_CHIPS }; + int buflen = BUF_LEN; + char *bufptr = buf; + sensors_proc_chips_entry entry; + int lineno; if (sysctl(name, 3, bufptr, &buflen, NULL, 0)) return -SENSORS_ERR_PROC; diff --git a/lib/sysfs.c b/lib/sysfs.c index 1fd3a024..d7f81d53 100644 --- a/lib/sysfs.c +++ b/lib/sysfs.c @@ -17,6 +17,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +/* this define needed for strndup() */ +#define _GNU_SOURCE + #include #include #include @@ -39,6 +42,122 @@ int sensors_init_sysfs(void) return sensors_found_sysfs; } +/* returns: 0 if successful, !0 otherwise */ +static int sensors_read_one_sysfs_chip(struct sysfs_device *dev) +{ + struct sysfs_attribute *attr, *bus_attr; + char bus_path[SYSFS_PATH_MAX]; + sensors_proc_chips_entry entry; + + /* ignore any device without name attribute */ + if (!(attr = sysfs_get_device_attr(dev, "name"))) + return 0; + + /* ignore subclients */ + if (attr->len >= 11 && !strcmp(attr->value + attr->len - 11, + " subclient\n")) + return 0; + + /* also ignore eeproms */ + if (!strcmp(attr->value, "eeprom\n")) + return 0; + + /* NB: attr->value[attr->len-1] == '\n'; chop that off */ + entry.name.prefix = strndup(attr->value, attr->len - 1); + if (!entry.name.prefix) + sensors_fatal_error(__FUNCTION__, "out of memory"); + + entry.name.busname = strdup(dev->path); + if (!entry.name.busname) + sensors_fatal_error(__FUNCTION__, "out of memory"); + + if (sscanf(dev->name, "%d-%x", &entry.name.bus, &entry.name.addr) != 2) + return -SENSORS_ERR_PARSE; + + /* find out if ISA or not */ + snprintf(bus_path, sizeof(bus_path), + "%s/class/i2c-adapter/i2c-%d/device/name", + sensors_sysfs_mount, entry.name.bus); + + if ((bus_attr = sysfs_open_attribute(bus_path))) { + if (sysfs_read_attribute(bus_attr)) + return -SENSORS_ERR_PARSE; + + if (bus_attr->value && !strncmp(bus_attr->value, "ISA ", 4)) + entry.name.bus = SENSORS_CHIP_NAME_BUS_ISA; + + sysfs_close_attribute(bus_attr); + } + + sensors_add_proc_chips(&entry); + + return 0; +} + +/* returns 0 if successful, !0 otherwise */ +static int sensors_read_sysfs_chips_compat(void) +{ + struct sysfs_bus *bus; + struct dlist *devs; + struct sysfs_device *dev; + int ret = 0; + + if (!(bus = sysfs_open_bus("i2c"))) { + ret = -SENSORS_ERR_PROC; + goto exit0; + } + + if (!(devs = sysfs_get_bus_devices(bus))) { + ret = -SENSORS_ERR_PROC; + goto exit1; + } + + dlist_for_each_data(devs, dev, struct sysfs_device) + if ((ret = sensors_read_one_sysfs_chip(dev))) + goto exit1; + +exit1: + /* this frees bus and devs */ + sysfs_close_bus(bus); + +exit0: + return ret; +} + +/* returns 0 if successful, !0 otherwise */ +int sensors_read_sysfs_chips(void) +{ + struct sysfs_class *cls; + struct dlist *clsdevs; + struct sysfs_class_device *clsdev; + int ret = 0; + + if (!(cls = sysfs_open_class("hwmon"))) { + /* compatibility function for kernel 2.6.n where n <= 13 */ + return sensors_read_sysfs_chips_compat(); + } + + if (!(clsdevs = sysfs_get_class_devices(cls))) { + ret = -SENSORS_ERR_PROC; + goto exit; + } + + dlist_for_each_data(clsdevs, clsdev, struct sysfs_class_device) { + struct sysfs_device *dev; + if (!(dev = sysfs_get_classdev_device(clsdev))) { + ret = -SENSORS_ERR_PROC; + goto exit; + } + if ((ret = sensors_read_one_sysfs_chip(dev))) + goto exit; + } + +exit: + /* this frees cls and clsdevs */ + sysfs_close_class(cls); + return ret; +} + /* returns 0 if successful, !0 otherwise */ int sensors_read_sysfs_bus(void) { diff --git a/lib/sysfs.h b/lib/sysfs.h index 711ad354..331307ad 100644 --- a/lib/sysfs.h +++ b/lib/sysfs.h @@ -26,6 +26,8 @@ extern char sensors_sysfs_mount[]; extern int sensors_init_sysfs(void); +extern int sensors_read_sysfs_chips(void); + extern int sensors_read_sysfs_bus(void); #endif /* !SENSORS_LIB_SYSFS_H */