andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make cvt complain about invalid arguments more often.

Browse Source 
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:
Keith Packard 2009-01-06 08:36:39 -08:00
parent 1da4a41b08
commit 4c326c4d34
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hw/xfree86/utils/cvt/cvt.c
View File

@ -202,7 +202,7 @@ main (int argc, char *argv[])
if ((argc < 3) || (argc > 7)) {
PrintUsage(argv[0]);
return 0;
return 1;
}
/* 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")) {
PrintUsage(argv[0]);
return 0;
} else if (!HDisplay)
} else if (!HDisplay) {
HDisplay = atoi(argv[n]);
else if (!VDisplay)
if (!HDisplay) {
PrintUsage(argv[0]);
return 1;
}
}
else if (!VDisplay) {
VDisplay = atoi(argv[n]);
else if (!VRefresh)
if (!VDisplay) {
PrintUsage(argv[0]);
return 1;
}
}
else if (!VRefresh) {
VRefresh = atof(argv[n]);
if (!VRefresh) {
PrintUsage(argv[0]);
return 1;
}
}
else {
PrintUsage(argv[0]);
return 0;
return 1;
}
}