fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-01-11 16:50:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tools: make the tools exit with exit code 2 on usage issues

Browse source 
This makes it easier to test for usage issues

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2018-11-01 09:39:49 +10:00
parent bd52bf5421
commit 36af7d312b
6 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tools/libinput-debug-events.c
View file

@ -944,11 +944,11 @@ main(int argc, char **argv)
switch(c) {
case '?':
exit(1);
exit(EXIT_INVALID_USAGE);
break;
case 'h':
usage();
exit(0);
exit(EXIT_SUCCESS);
break;
case OPT_SHOW_KEYCODES:
show_keycodes = true;
@ -973,7 +973,7 @@ main(int argc, char **argv)
default:
if (tools_parse_option(c, optarg, &options) != 0) {
usage();
return 1;
return EXIT_INVALID_USAGE;
}
break;
}
@ -982,7 +982,7 @@ main(int argc, char **argv)
if (optind < argc) {
usage();
return 1;
return EXIT_INVALID_USAGE;
}
memset(&act, 0, sizeof(act));
@ -997,11 +997,11 @@ main(int argc, char **argv)
li = tools_open_backend(backend, seat_or_device, verbose, &grab);
if (!li)
return 1;
return EXIT_FAILURE;
mainloop(li);
libinput_unref(li);
return 0;
return EXIT_SUCCESS;
}

10
tools/libinput-debug-gui.c
View file

@ -968,7 +968,7 @@ main(int argc, char **argv)
switch(c) {
case '?':
exit(1);
exit(EXIT_INVALID_USAGE);
break;
case 'h':
usage();
@ -991,7 +991,7 @@ main(int argc, char **argv)
default:
if (tools_parse_option(c, optarg, &options) != 0) {
usage();
return 1;
return EXIT_INVALID_USAGE;
}
break;
}
@ -1000,12 +1000,12 @@ main(int argc, char **argv)
if (optind < argc) {
usage();
return 1;
return EXIT_INVALID_USAGE;
}
li = tools_open_backend(backend, seat_or_device, verbose, &w.grab);
if (!li)
return 1;
return EXIT_FAILURE;
libinput_set_user_data(li, &w);
@ -1019,5 +1019,5 @@ main(int argc, char **argv)
window_cleanup(&w);
libinput_unref(li);
return 0;
return EXIT_SUCCESS;
}

2
tools/libinput-list-devices.c
View file

@ -388,7 +388,7 @@ main(int argc, char **argv)
return 0;
} else {
usage();
return 1;
return EXIT_INVALID_USAGE;
}
}

4
tools/libinput-tool.c
View file

@ -98,13 +98,13 @@ main(int argc, char **argv)
return EXIT_SUCCESS;
default:
usage();
return EXIT_FAILURE;
return EXIT_INVALID_USAGE;
}
}
if (optind >= argc) {
usage();
return EXIT_FAILURE;
return EXIT_INVALID_USAGE;
}
argv += optind;

2
tools/shared.c
View file

@ -576,7 +576,7 @@ tools_exec_command(const char *prefix, int real_argc, char **real_argv)
"libinput: %s is not a libinput command or not installed. "
"See 'libinput --help'\n",
command);
return EXIT_INVALID_USAGE;
} else {
fprintf(stderr,
"Failed to execute '%s' (%s)\n",

2
tools/shared.h
View file

@ -30,6 +30,8 @@
#include <quirks.h>
#include <libinput.h>
#define EXIT_INVALID_USAGE 2
enum configuration_options {
OPT_TAP_ENABLE = 256,
OPT_TAP_DISABLE,