Changeset 847

Timestamp:

07/17/00 00:54:41 (13 years ago)

Author:

mds

Message:

(mds) fix error reporting when you don't have permission to open

/dev/i2c-x and /dev/i2cx doesn't exist.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• prog/detect/i2cdetect.c (modified) (2 diffs)
• prog/dump/i2cdump.c (modified) (2 diffs)

lm-sensors/trunk/CHANGES

@@ -13 +13 @@
     for example:
       cvs diff -r V2-0-0 -r V2-0-1 -u
+
+2.5.3 (2000????)
+  Programs i2cdetect, i2cdump: Improve error reporting
 
 2.5.2 (20000709)

lm-sensors/trunk/prog/detect/i2cdetect.c

@@ -46 +46 @@
   char *end;
   int i,j,res,i2cbus,file;
+  int e1, e2;
   char filename1[20];
   char filename2[20];
@@ -72 +73 @@
   sprintf(filename2,"/dev/i2c%d",i2cbus);
   if ((file = open(filename1,O_RDWR)) < 0) {
+    e1 = errno;
     if ((file = open(filename2,O_RDWR)) < 0) {
-      fprintf(stderr,"Error: Could not open file `%s' or `%s': %s\n",filename1,
-              filename2,strerror(errno));
+      e2 = errno;
+      if(e1 == ENOENT && e2 == ENOENT) {
+        fprintf(stderr,"Error: Could not open file `%s' or `%s': %s\n",
+                   filename1,filename2,strerror(ENOENT));
+      }
+      if (e1 != ENOENT) {
+        fprintf(stderr,"Error: Could not open file `%s' : %s\n",
+                   filename1,strerror(e1));
+        if(e1 == EACCES)
+          fprintf(stderr,"Run as root?\n");
+      }
+      if (e2 != ENOENT) {
+        fprintf(stderr,"Error: Could not open file `%s' : %s\n",
+                   filename2,strerror(e2));
+        if(e2 == EACCES)
+          fprintf(stderr,"Run as root?\n");
+      }
       exit(1);
     } else {

lm-sensors/trunk/prog/dump/i2cdump.c

@@ -46 +46 @@
   char *end;
   int i,j,res,i2cbus,address,size,file;
+  int e1, e2;
   int bank = 0, bankreg = 0x4E;
   char filename1[20];
@@ -129 +130 @@
   sprintf(filename2,"/dev/i2c%d",i2cbus);
   if ((file = open(filename1,O_RDWR)) < 0) {
+    e1 = errno;
     if ((file = open(filename2,O_RDWR)) < 0) {
-      fprintf(stderr,"Error: Could not open file `%s' or `%s': %s\n",filename1,
-              filename2,strerror(errno));
+      e2 = errno;
+      if(e1 == ENOENT && e2 == ENOENT) {
+        fprintf(stderr,"Error: Could not open file `%s' or `%s': %s\n",
+                   filename1,filename2,strerror(ENOENT));
+      }
+      if (e1 != ENOENT) {
+        fprintf(stderr,"Error: Could not open file `%s' : %s\n",
+                   filename1,strerror(e1));
+        if(e1 == EACCES)
+          fprintf(stderr,"Run as root?\n");
+      }
+      if (e2 != ENOENT) {
+        fprintf(stderr,"Error: Could not open file `%s' : %s\n",
+                   filename2,strerror(e2));
+        if(e2 == EACCES)
+          fprintf(stderr,"Run as root?\n");
+      }
       exit(1);
     } else {