Changeset 4899

Timestamp:

09/29/07 20:48:20 (6 years ago)

Author:

khali

Message:

libsensors: Report I/O errors as such.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

• CHANGES (modified) (1 diff)
• lib/error.c (modified) (1 diff)
• lib/error.h (modified) (1 diff)
• lib/sysfs.c (modified) (2 diffs)

lm-sensors/branches/lm-sensors-3.0.0/CHANGES

@@ -6 +6 @@
   libsensors: Notify the caller when writing a value fails
               Differentiate between different read error types
+              Report I/O errors as such
   sensord: Log the error code on failure
   sensors: Fix spurious critical temperature alarm

lm-sensors/branches/lm-sensors-3.0.0/lib/error.c

@@ -43 +43 @@
         /* SENSORS_ERR_PARSE     */ "General parse error",
         /* SENSORS_ERR_ACCESS_W  */ "Can't write",
+        /* SENSORS_ERR_IO        */ "I/O error",
 };
 

lm-sensors/branches/lm-sensors-3.0.0/lib/error.h

@@ -31 +31 @@
 #define SENSORS_ERR_PARSE       8 /* General parse error */
 #define SENSORS_ERR_ACCESS_W    9 /* Can't write */
+#define SENSORS_ERR_IO          10 /* I/O error */
 
 #ifdef __cplusplus

lm-sensors/branches/lm-sensors-3.0.0/lib/sysfs.c

@@ -558 +558 @@
         snprintf(n, NAME_MAX, "%s/%s", name->path, subfeature->name);
         if ((f = fopen(n, "r"))) {
-                int res = fscanf(f, "%lf", value);
-                if (fclose(f) || res != 1)
-                        return -SENSORS_ERR_ACCESS_R;
+                int res, err = 0;
+
+                errno = 0;
+                res = fscanf(f, "%lf", value);
+                if (res == EOF && errno == EIO)
+                        err = -SENSORS_ERR_IO;
+                else if (res != 1)
+                        err = -SENSORS_ERR_ACCESS_R;
+                res = fclose(f);
+                if (err)
+                        return err;
+
+                if (res == EOF) {
+                        if (errno == EIO)
+                                return -SENSORS_ERR_IO;
+                        else 
+                                return -SENSORS_ERR_ACCESS_R;
+                }
                 *value /= get_type_scaling(subfeature->type);
         } else
@@ -577 +592 @@
         snprintf(n, NAME_MAX, "%s/%s", name->path, subfeature->name);
         if ((f = fopen(n, "w"))) {
-                int res;
+                int res, err = 0;
+
                 value *= get_type_scaling(subfeature->type);
                 res = fprintf(f, "%d", (int) value);
-                if (fclose(f) || res < 0)
-                        return -SENSORS_ERR_ACCESS_W;
+                if (res == -EIO)
+                        err = -SENSORS_ERR_IO;
+                else if (res < 0)
+                        err = -SENSORS_ERR_ACCESS_W;
+                res = fclose(f);
+                if (err)
+                        return err;
+
+                if (res == EOF) {
+                        if (errno == EIO)
+                                return -SENSORS_ERR_IO;
+                        else 
+                                return -SENSORS_ERR_ACCESS_W;
+                }
         } else
                 return -SENSORS_ERR_KERNEL;