diff options
-rw-r--r-- | sway/commands/input/scroll_button.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sway/commands/input/scroll_button.c b/sway/commands/input/scroll_button.c index 6345b71b..350fcca2 100644 --- a/sway/commands/input/scroll_button.c +++ b/sway/commands/input/scroll_button.c | |||
@@ -1,5 +1,6 @@ | |||
1 | #include <string.h> | 1 | #include <string.h> |
2 | #include <strings.h> | 2 | #include <strings.h> |
3 | #include <errno.h> | ||
3 | #include "sway/config.h" | 4 | #include "sway/config.h" |
4 | #include "sway/commands.h" | 5 | #include "sway/commands.h" |
5 | #include "sway/input/input-manager.h" | 6 | #include "sway/input/input-manager.h" |
@@ -18,13 +19,19 @@ struct cmd_results *input_cmd_scroll_button(int argc, char **argv) { | |||
18 | struct input_config *new_config = | 19 | struct input_config *new_config = |
19 | new_input_config(current_input_config->identifier); | 20 | new_input_config(current_input_config->identifier); |
20 | 21 | ||
22 | errno = 0; | ||
21 | char *endptr; | 23 | char *endptr; |
22 | long scroll_button = strtol(*argv, &endptr, 10); | 24 | int scroll_button = strtol(*argv, &endptr, 10); |
23 | if (endptr == *argv && scroll_button == 0) { | 25 | if (endptr == *argv && scroll_button == 0) { |
24 | free_input_config(new_config); | 26 | free_input_config(new_config); |
25 | return cmd_results_new(CMD_INVALID, "scroll_button", | 27 | return cmd_results_new(CMD_INVALID, "scroll_button", |
26 | "Scroll button identifier must be an integer."); | 28 | "Scroll button identifier must be an integer."); |
27 | } | 29 | } |
30 | if (errno == ERANGE) { | ||
31 | free_input_config(new_config); | ||
32 | return cmd_results_new(CMD_INVALID, "scroll_button", | ||
33 | "Scroll button identifier out of range."); | ||
34 | } | ||
28 | if (scroll_button < 0) { | 35 | if (scroll_button < 0) { |
29 | free_input_config(new_config); | 36 | free_input_config(new_config); |
30 | return cmd_results_new(CMD_INVALID, "scroll_button", | 37 | return cmd_results_new(CMD_INVALID, "scroll_button", |