Changeset 5638

Timestamp:

02/10/09 21:50:16 (4 years ago)

Author:

khali

Message:

Report configuration file read errors.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• lib/error.c (modified) (1 diff)
• lib/init.c (modified) (1 diff)

lm-sensors/trunk/CHANGES

@@ -10 +10 @@
               Skip non-file sysfs entries for speed
               Fix memory leak in scanner when using flex 2.5.9 or later
+              Report configuration file read errors
   lm_sensors.init: Support new format of /etc/sysconfig/lm_sensors (#2246)
                    Drop support for kernels 2.4 and earlier

lm-sensors/trunk/lib/error.c

@@ -59 +59 @@
 void sensors_default_parse_error(const char *err, int lineno)
 {
-        fprintf(stderr, "Error: Line %d: %s\n", lineno, err);
+        if (lineno)
+                fprintf(stderr, "Error: Line %d: %s\n", lineno, err);
+        else
+                fprintf(stderr, "Error: %s\n", err);
 }
 

lm-sensors/trunk/lib/init.c

@@ -89 +89 @@
                         }
                         fclose(input);
+                } else if (errno != ENOENT) {
+                        sensors_parse_error(strerror(errno), 0);
+                        goto exit_cleanup;
                 }
         }