Changeset 1126

Timestamp:

06/09/01 01:57:26 (12 years ago)

Author:

mds

Message:

fix broken /proc error message from long ago and add improved one

for when 'sensors -s' is not run as root.

Files:

• lm-sensors/trunk/prog/sensors/main.c (modified) (3 diffs)

lm-sensors/trunk/prog/sensors/main.c

@@ -208 +208 @@
 
   if ((res = sensors_init(config_file))) {
-    if (res == SENSORS_ERR_PROC)
+    fprintf(stderr,"%s\n",sensors_strerror(res));
+    if (res == -SENSORS_ERR_PROC)
       fprintf(stderr,
-              "/proc/sys/dev/sensors/chips or /proc/bus/i2c unreadable:\n"
-              "Make sure you have inserted modules sensors.o and i2c-proc.o!");
-    else
-      fprintf(stderr,"%s\n",sensors_strerror(res));
+              "/proc/sys/dev/sensors/chips or /proc/bus/i2c unreadable;\n"
+              "Make sure you have done 'modprobe i2c-proc'!\n");
     exit(1);
   }
@@ -251 +250 @@
 {
   int res;
-  if ((res = sensors_do_chip_sets(name))) 
-    fprintf(stderr,"%s: %s\n",sprintf_chip_name(name),sensors_strerror(res));
+  if ((res = sensors_do_chip_sets(name))) {
+    if (res == -SENSORS_ERR_PROC) {
+      fprintf(stderr,"%s: %s for writing;\n",sprintf_chip_name(name),
+              sensors_strerror(res));
+      fprintf(stderr,"Run as root?\n");
+    } else {
+      fprintf(stderr,"%s: %s\n",sprintf_chip_name(name),
+              sensors_strerror(res));
+    }
+  }
 }
 
@@ -321 +328 @@
   else if (!strncmp(name.prefix,"maxilife-", 9))
     print_maxilife(&name);
+  else if (!strcmp(name.prefix,"it87"))
+    print_it87(&name);
   else if (!strcmp(name.prefix,"ddcmon"))
     print_ddcmon(&name);
   else if (!strcmp(name.prefix,"eeprom"))
     print_eeprom(&name);
-  else if (!strcmp(name.prefix,"it87"))
-    print_it87(&name);
   else
     print_unknown_chip(&name);