Make cvt complain about invalid arguments more often.
cvt doesn't correctly parse 'cvt -vr 1920 1080'. This patch doesn't fix that, but it does at least generate an error message now. Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
1da4a41b08
commit
4c326c4d34
|
@ -202,7 +202,7 @@ main (int argc, char *argv[])
|
||||||
|
|
||||||
if ((argc < 3) || (argc > 7)) {
|
if ((argc < 3) || (argc > 7)) {
|
||||||
PrintUsage(argv[0]);
|
PrintUsage(argv[0]);
|
||||||
return 0;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* This doesn't filter out bad flags properly. Bad flags get passed down
|
/* This doesn't filter out bad flags properly. Bad flags get passed down
|
||||||
|
@ -219,15 +219,30 @@ main (int argc, char *argv[])
|
||||||
else if (!strcmp(argv[n], "-h") || !strcmp(argv[n], "--help")) {
|
else if (!strcmp(argv[n], "-h") || !strcmp(argv[n], "--help")) {
|
||||||
PrintUsage(argv[0]);
|
PrintUsage(argv[0]);
|
||||||
return 0;
|
return 0;
|
||||||
} else if (!HDisplay)
|
} else if (!HDisplay) {
|
||||||
HDisplay = atoi(argv[n]);
|
HDisplay = atoi(argv[n]);
|
||||||
else if (!VDisplay)
|
if (!HDisplay) {
|
||||||
|
PrintUsage(argv[0]);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (!VDisplay) {
|
||||||
VDisplay = atoi(argv[n]);
|
VDisplay = atoi(argv[n]);
|
||||||
else if (!VRefresh)
|
if (!VDisplay) {
|
||||||
|
PrintUsage(argv[0]);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (!VRefresh) {
|
||||||
VRefresh = atof(argv[n]);
|
VRefresh = atof(argv[n]);
|
||||||
|
if (!VRefresh) {
|
||||||
|
PrintUsage(argv[0]);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
else {
|
else {
|
||||||
PrintUsage(argv[0]);
|
PrintUsage(argv[0]);
|
||||||
return 0;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user