Changeset 5036 for lm-sensors/trunk/lib/sysfs.c

Timestamp:

11/24/07 11:46:02 (3 years ago)

Author:

khali

Message:

Fix sysfs presence detection. Since sysfsutils 2.0.0, libsysfs will
return success even if sysfs isn't mounted. We have to check by ourselves
if it is mounted or not, so that we can fallback to procfs on Linux 2.4
systems.

Files:

• lm-sensors/trunk/lib/sysfs.c (modified) (2 diffs)

lm-sensors/trunk/lib/sysfs.c

@@ -21 +21 @@
 #define _GNU_SOURCE
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
@@ -39 +42 @@
 int sensors_init_sysfs(void)
 {
-        if (sysfs_get_mnt_path(sensors_sysfs_mount, NAME_MAX) == 0)
+        struct stat statbuf;
+
+        /* libsysfs will return success even if sysfs is not mounted,
+           so we have to double-check */
+        if (sysfs_get_mnt_path(sensors_sysfs_mount, NAME_MAX) == 0
+         && stat(sensors_sysfs_mount, &statbuf) == 0
+         && statbuf.st_nlink > 2)
                 sensors_found_sysfs = 1;