xserver: Branch 'master'

[Keith Packard]

 hw/xfree86/utils/cvt/cvt.c |   25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

New commits:
commit 4c326c4d342bede0de57e71c1431f56188f812ce
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Jan 6 08:36:39 2009 -0800

    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 at keithp.com>

diff --git a/hw/xfree86/utils/cvt/cvt.c b/hw/xfree86/utils/cvt/cvt.c
index 25a8e32..500e31f 100644
--- a/hw/xfree86/utils/cvt/cvt.c
+++ b/hw/xfree86/utils/cvt/cvt.c
@@ -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;
         }
     }