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

Consistencely allow '-?' to get a help text.

pull/7/head
Oliver Hartkopp 2009-01-13 09:32:45 +00:00
parent 278ba6377d
commit 4369ac1c55
10 changed files with 56 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
asc2log.c
View File

@ -182,7 +182,7 @@ int main(int argc, char **argv)
int data[8];
int i, found, opt;
while ((opt = getopt(argc, argv, "I:O:v")) != -1) {
while ((opt = getopt(argc, argv, "I:O:v?")) != -1) {
switch (opt) {
case 'I':
infile = fopen(optarg, "r");
@ -204,6 +204,11 @@ int main(int argc, char **argv)
verbose = 1;
break;
case '?':
print_usage(basename(argv[0]));
return 0;
break;
default:
fprintf(stderr, "Unknown option %c\n", opt);
print_usage(basename(argv[0]));

3
canplayer.c
View File

@ -245,7 +245,7 @@ int main(int argc, char **argv)
int eof, nbytes, i, j;
char *fret;
while ((opt = getopt(argc, argv, "I:l:tg:s:xv")) != -1) {
while ((opt = getopt(argc, argv, "I:l:tg:s:xv?")) != -1) {
switch (opt) {
case 'I':
infile = fopen(optarg, "r");
@ -289,6 +289,7 @@ int main(int argc, char **argv)
verbose++;
break;
case '?':
default:
print_usage(basename(argv[0]));
return 1;

2
cansniffer.c
View File

@ -212,7 +212,7 @@ int main(int argc, char **argv)
for (i=0; i < 2048 ;i++) /* default: check all CAN-IDs */
do_set(i, ENABLE);
while ((opt = getopt(argc, argv, "m:v:r:t:h:l:qbBcf")) != -1) {
while ((opt = getopt(argc, argv, "m:v:r:t:h:l:qbBcf?")) != -1) {
switch (opt) {
case 'm':
sscanf(optarg, "%x", &mask);

9
isotpdump.c
View File

@ -103,7 +103,7 @@ int main(int argc, char **argv)
last_tv.tv_sec = 0;
last_tv.tv_usec = 0;
while ((opt = getopt(argc, argv, "s:d:ax:ct:")) != -1) {
while ((opt = getopt(argc, argv, "s:d:ax:ct:?")) != -1) {
switch (opt) {
case 's':
src = strtoul(optarg, (char **)NULL, 16);
@ -144,10 +144,15 @@ int main(int argc, char **argv)
}
break;
case '?':
print_usage(basename(argv[0]));
exit(0);
break;
default:
fprintf(stderr, "Unknown option %c\n", opt);
print_usage(basename(argv[0]));
exit(0);
exit(1);
break;
}
}

11
isotprecv.c
View File

@ -94,7 +94,7 @@ int main(int argc, char **argv)
addr.can_addr.tp.tx_id = addr.can_addr.tp.rx_id = NO_CAN_ID;
while ((opt = getopt(argc, argv, "s:d:x:p:P:b:m:w:l")) != -1) {
while ((opt = getopt(argc, argv, "s:d:x:p:P:b:m:w:l?")) != -1) {
switch (opt) {
case 's':
addr.can_addr.tp.tx_id = strtoul(optarg, (char **)NULL, 16);
@ -148,10 +148,15 @@ int main(int argc, char **argv)
loop = 1;
break;
case '?':
print_usage(basename(argv[0]));
exit(0);
break;
default:
fprintf(stderr, "Unknown option %c\n", opt);
print_usage(basename(argv[0]));
exit(0);
exit(1);
break;
}
}
@ -160,7 +165,7 @@ int main(int argc, char **argv)
(addr.can_addr.tp.tx_id == NO_CAN_ID) ||
(addr.can_addr.tp.rx_id == NO_CAN_ID)) {
print_usage(basename(argv[0]));
exit(0);
exit(1);
}
if ((s = socket(PF_CAN, SOCK_DGRAM, CAN_ISOTP)) < 0) {

11
isotpsend.c
View File

@ -88,7 +88,7 @@ int main(int argc, char **argv)
addr.can_addr.tp.tx_id = addr.can_addr.tp.rx_id = NO_CAN_ID;
while ((opt = getopt(argc, argv, "s:d:x:p:P:t:")) != -1) {
while ((opt = getopt(argc, argv, "s:d:x:p:P:t:?")) != -1) {
switch (opt) {
case 's':
addr.can_addr.tp.tx_id = strtoul(optarg, (char **)NULL, 16);
@ -130,10 +130,15 @@ int main(int argc, char **argv)
opts.frame_txtime = strtoul(optarg, (char **)NULL, 10);
break;
case '?':
print_usage(basename(argv[0]));
exit(0);
break;
default:
fprintf(stderr, "Unknown option %c\n", opt);
print_usage(basename(argv[0]));
exit(0);
exit(1);
break;
}
}
@ -142,7 +147,7 @@ int main(int argc, char **argv)
(addr.can_addr.tp.tx_id == NO_CAN_ID) ||
(addr.can_addr.tp.rx_id == NO_CAN_ID)) {
print_usage(basename(argv[0]));
exit(0);
exit(1);
}
if ((s = socket(PF_CAN, SOCK_DGRAM, CAN_ISOTP)) < 0) {

11
isotpsniffer.c
View File

@ -193,7 +193,7 @@ int main(int argc, char **argv)
unsigned char buffer[4096];
int nbytes;
while ((opt = getopt(argc, argv, "s:d:x:h:ct:f:")) != -1) {
while ((opt = getopt(argc, argv, "s:d:x:h:ct:f:?")) != -1) {
switch (opt) {
case 's':
src = strtoul(optarg, (char **)NULL, 16);
@ -234,17 +234,22 @@ int main(int argc, char **argv)
}
break;
case '?':
print_usage(basename(argv[0]));
exit(0);
break;
default:
fprintf(stderr, "Unknown option %c\n", opt);
print_usage(basename(argv[0]));
exit(0);
exit(1);
break;
}
}
if ((argc - optind) != 1 || src == NO_CAN_ID || dst == NO_CAN_ID) {
print_usage(basename(argv[0]));
exit(0);
exit(1);
}
if ((s = socket(PF_CAN, SOCK_DGRAM, CAN_ISOTP)) < 0) {

11
isotptun.c
View File

@ -111,7 +111,7 @@ int main(int argc, char **argv)
addr.can_addr.tp.tx_id = addr.can_addr.tp.rx_id = NO_CAN_ID;
while ((opt = getopt(argc, argv, "s:d:x:p:q:P:t:b:m:whv")) != -1) {
while ((opt = getopt(argc, argv, "s:d:x:p:q:P:t:b:m:whv?")) != -1) {
switch (opt) {
case 's':
addr.can_addr.tp.tx_id = strtoul(optarg, (char **)NULL, 16);
@ -178,10 +178,15 @@ int main(int argc, char **argv)
verbose = 1;
break;
case '?':
print_usage(basename(argv[0]));
exit(0);
break;
default:
fprintf(stderr, "Unknown option %c\n", opt);
print_usage(basename(argv[0]));
exit(0);
exit(1);
break;
}
}
@ -190,7 +195,7 @@ int main(int argc, char **argv)
(addr.can_addr.tp.tx_id == NO_CAN_ID) ||
(addr.can_addr.tp.rx_id == NO_CAN_ID)) {
print_usage(basename(argv[0]));
exit(0);
exit(1);
}
if ((s = socket(PF_CAN, SOCK_DGRAM, CAN_ISOTP)) < 0) {

7
log2asc.c
View File

@ -79,7 +79,7 @@ int main(int argc, char **argv)
FILE *outfile = stdout;
static int maxdev, devno, i, crlf, d4, opt;
while ((opt = getopt(argc, argv, "I:O:4n")) != -1) {
while ((opt = getopt(argc, argv, "I:O:4n?")) != -1) {
switch (opt) {
case 'I':
infile = fopen(optarg, "r");
@ -105,6 +105,11 @@ int main(int argc, char **argv)
d4 = 1;
break;
case '?':
print_usage(basename(argv[0]));
return 0;
break;
default:
fprintf(stderr, "Unknown option %c\n", opt);
print_usage(basename(argv[0]));

3
slcan_attach.c
View File

@ -86,7 +86,7 @@ int main(int argc, char **argv)
char *tty;
int opt;
while ((opt = getopt(argc, argv, "l:dwocs:b:")) != -1) {
while ((opt = getopt(argc, argv, "l:dwocs:b:?")) != -1) {
switch (opt) {
case 'l':
fprintf(stderr, "Ignored option '-l'\n");
@ -120,6 +120,7 @@ int main(int argc, char **argv)
print_usage(argv[0]);
break;
case '?':
default:
print_usage(argv[0]);
break;