sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cansniffer: add error handling for read/write of sniffsets 

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
pull/334/head
Oliver Hartkopp 2022-01-22 13:12:34 +01:00
parent 4c07a11f81
commit fb186ed6c8
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cansniffer.c
View File

@ -132,7 +132,7 @@ void print_snifline(int slot);
int handle_keyb(void); int handle_keyb(void);
int handle_frame(int fd, long currcms); int handle_frame(int fd, long currcms);
int handle_timeo(long currcms); int handle_timeo(long currcms);
void writesettings(char* name); int writesettings(char* name);
int readsettings(char* name); int readsettings(char* name);
int sniftab_index(canid_t id); int sniftab_index(canid_t id);
@ -489,11 +489,13 @@ int handle_keyb(void)
break; break;
case 'w' : case 'w' :
writesettings(&cmd[1]); if (writesettings(&cmd[1]))
return 0;
break; break;
case 'r' : case 'r' :
readsettings(&cmd[1]); /* don't care about success */ if (readsettings(&cmd[1]) < 0)
return 0;
break; break;
case 'q' : case 'q' :
@ -774,7 +776,7 @@ void print_snifline(int slot)
memset(&sniftab[slot].marker.data, 0, 8); memset(&sniftab[slot].marker.data, 0, 8);
} }
void writesettings(char* name) int writesettings(char* name)
{ {
int fd; int fd;
char fname[30] = SETFNAME; char fname[30] = SETFNAME;
@ -785,23 +787,30 @@ void writesettings(char* name)
fd = open(fname, O_WRONLY|O_CREAT, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); fd = open(fname, O_WRONLY|O_CREAT, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
if (fd <= 0) { if (fd <= 0) {
printf("unable to write setting file '%s'!\n", fname); printf("unable to write setting file '%s'!\n", fname);
return; return 1;
} }
for (i = 0; i < idx ;i++) { for (i = 0; i < idx ;i++) {
sprintf(buf, "<%08X>%c.", sniftab[i].current.can_id, (is_set(i, ENABLE))?'1':'0'); sprintf(buf, "<%08X>%c.", sniftab[i].current.can_id, (is_set(i, ENABLE))?'1':'0');
if (write(fd, buf, 12) < 0) if (write(fd, buf, 12) < 0) {
perror("write"); perror("write");
return 1;
}
for (j = 0; j < 8 ; j++) { for (j = 0; j < 8 ; j++) {
sprintf(buf, "%02X", sniftab[i].notch.data[j]); sprintf(buf, "%02X", sniftab[i].notch.data[j]);
if (write(fd, buf, 2) < 0) if (write(fd, buf, 2) < 0) {
perror("write"); perror("write");
return 1;
}
} }
if (write(fd, "\n", 1) < 0) if (write(fd, "\n", 1) < 0) {
perror("write"); perror("write");
return 1;
}
/* 12 + 16 + 1 = 29 bytes per entry */ /* 12 + 16 + 1 = 29 bytes per entry */
} }
close(fd); close(fd);
return 0;
} }
int readsettings(char* name) int readsettings(char* name)