From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 12 Jan 2012 06:01:28 +0000 (+1000)
Subject: Merge branch 'multitouch'
X-Git-Url: https://diplodocus.org/git/xorg-xinput/commitdiff_plain/fb6f41ced063c558f7bf8f10898f027612e2ad34?hp=7f2f41d2c8fa7dad9596c34160a85fea026afccb

Merge branch 'multitouch'
---

diff --git a/src/xinput.c b/src/xinput.c
index f12d69c..80a1789 100644
--- 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);