Changeset 4792

Timestamp:

09/09/07 17:47:08 (6 years ago)

Author:

khali

Message:

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

Files:

• lm-sensors/trunk/lib/access.c (modified) (3 diffs)

lm-sensors/trunk/lib/access.c

@@ -28 +28 @@
 #include "proc.h"
 #include "general.h"
+#include "sysfs.h"
 
 static int sensors_do_this_chip_sets(sensors_chip_name name);
@@ -150 +151 @@
         const sensors_chip *chip;
         const sensors_chip_feature *featureptr;
-        char buf[128], path[PATH_MAX];
-        FILE *f;
         int i;
 
@@ -167 +166 @@
                         }
 
-        /* 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;
+                        }
                 }
         }