Merge branch 'multitouch'

diff --git a/src/xinput.c b/src/xinput.c
index f12d69cdc274cf7c2708253c8c8a9d696307368e..80a1789cee6e980890457b283339bf32c2bc636b 100644 (file)
--- a/src/xinput.c
+++ b/src/xinput.c
@@ -143,8 +143,8 @@ static entry drivers[] =
 
 static const char version_id[] = VERSION;
 
-int
-print_version()
+static int
+print_version(void)
 {
     XExtensionVersion  *version;
     Display *display;
@@ -348,16 +348,20 @@ main(int argc, char * argv[])
     char        *func;
     int event, error;
 
-    if (argc < 2) {
-       usage();
-       return EXIT_FAILURE;
+    if (argc > 1) {
+       func = argv[1];
+       while(func[0] == '-') func++;
+    } else {
+       func = "list";
     }
 
-    func = argv[1];
-    while((*func) == '-') func++;
-
     if (strcmp("version", func) == 0) {
-        return print_version(argv[0]);
+        return print_version();
+    }
+
+    if (strcmp("help", func) == 0) {
+        usage();
+        return 0;
     }
 
     display = XOpenDisplay(NULL);