From 6b6f8151a41147eb44d08f33de143b43eb004563 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 29 Apr 2015 07:53:56 +1000 Subject: [PATCH] tools: print version number in libinput-list-devices Makes debugging a bit easier when you can just ask users to do that instead of digging around in whatever packaging system they have. Signed-off-by: Peter Hutterer Reviewed-By: Derek Foreman --- tools/libinput-list-devices.c | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/tools/libinput-list-devices.c b/tools/libinput-list-devices.c index 24c7c53..c9e1191 100644 --- a/tools/libinput-list-devices.c +++ b/tools/libinput-list-devices.c @@ -30,6 +30,7 @@ #include #include +#include #include "shared.h" @@ -240,6 +241,23 @@ print_device_notify(struct libinput_event *ev) printf("\n"); } +static inline void +usage(void) +{ + printf("Usage: %s [--help|--version]\n" + "\n" + "This tool creates a libinput context on the default seat \"seat0\"\n" + "and lists all devices recognized by libinput and the configuration options.\n" + "Where multiple options are possible, the default is prefixed with \"*\".\n" + "\n" + "Options:\n" + "--help ...... show this help\n" + "--version ... show version information\n" + "\n" + "This tool requires access to the /dev/input/eventX nodes.\n", + program_invocation_short_name); +} + int main(int argc, char **argv) { @@ -248,16 +266,16 @@ main(int argc, char **argv) struct libinput_event *ev; if (argc > 1) { - printf("Usage: %s [--help]\n" - "\n" - "This tool creates a libinput context on the default seat \"seat0\"\n" - "and lists all devices recognized by libinput and the configuration options.\n" - "Where multiple options are possible, the default is prefixed with \"*\".\n" - "\n" - "This tool requires access to the /dev/input/eventX nodes.\n", - program_invocation_short_name); - - return 1; + if (strcmp(argv[1], "--help") == 0) { + usage(); + return 0; + } else if (strcmp(argv[1], "--version") == 0) { + printf("%s\n", LIBINPUT_VERSION); + return 0; + } else { + usage(); + return 1; + } } tools_init_options(&options); -- 2.7.4