[PATCH] xinput: Assume 'list' by default if no args given.

[Jeremy Huddleston]

Does anything trigger usage() now?  Can you send a followup (or squash in) support for 'xinput --help' for further consistency?

On Nov 29, 2011, at 4:57 PM, Bryce Harrington wrote:

> xrandr lists all outputs by default when run with no args.  So, make
> xinput list all inputs by default when run the same way, so the tools
> are consistent.
> 
> Signed-off-by: Bryce Harrington <bryce at canonical.com>
> ---
> src/xinput.c |   11 +++++------
> 1 files changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/src/xinput.c b/src/xinput.c
> index 9ca3832..4451b82 100644
> --- a/src/xinput.c
> +++ b/src/xinput.c
> @@ -327,14 +327,13 @@ 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) == '-') func++;
> +    } else {
> +	func = "list";
>     }
> 
> -    func = argv[1];
> -    while((*func) == '-') func++;
> -
>     if (strcmp("version", func) == 0) {
>         return print_version(argv[0]);
>     }
> -- 
> 1.7.4.1
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
>