diff options
author | Rex Hackbro <rex.hackbro@mailbox.org> | 2020-08-03 13:25:08 +0200 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2020-08-03 15:39:48 +0200 |
commit | 12a9ae013e439146484c14ed4419438491da4db5 (patch) | |
tree | 63ff29bce0da5a4669fb2c1e4fcae782adb80a38 | |
parent | fix typos (diff) | |
download | sway-12a9ae013e439146484c14ed4419438491da4db5.tar.gz sway-12a9ae013e439146484c14ed4419438491da4db5.tar.zst sway-12a9ae013e439146484c14ed4419438491da4db5.zip |
fix force_display_urgency_hint parsing
-rw-r--r-- | sway/commands/force_display_urgency_hint.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/sway/commands/force_display_urgency_hint.c b/sway/commands/force_display_urgency_hint.c index 3202fc43..3d432cba 100644 --- a/sway/commands/force_display_urgency_hint.c +++ b/sway/commands/force_display_urgency_hint.c | |||
@@ -1,5 +1,6 @@ | |||
1 | #include "sway/commands.h" | 1 | #include "sway/commands.h" |
2 | #include "sway/config.h" | 2 | #include "sway/config.h" |
3 | #include <errno.h> | ||
3 | 4 | ||
4 | struct cmd_results *cmd_force_display_urgency_hint(int argc, char **argv) { | 5 | struct cmd_results *cmd_force_display_urgency_hint(int argc, char **argv) { |
5 | struct cmd_results *error = NULL; | 6 | struct cmd_results *error = NULL; |
@@ -8,13 +9,16 @@ struct cmd_results *cmd_force_display_urgency_hint(int argc, char **argv) { | |||
8 | return error; | 9 | return error; |
9 | } | 10 | } |
10 | 11 | ||
11 | char *err; | 12 | errno = 0; |
12 | int timeout = (int)strtol(argv[0], &err, 10); | 13 | char *end; |
13 | if (*err) { | 14 | int timeout = (int)strtol(argv[0], &end, 10); |
14 | if (strcmp(err, "ms") != 0) { | 15 | if (errno || end == argv[0] || (*end && strcmp(end, "ms") != 0)) { |
15 | return cmd_results_new(CMD_INVALID, | 16 | return cmd_results_new(CMD_INVALID, "timeout integer invalid"); |
16 | "Expected 'force_display_urgency_hint <timeout> ms'"); | 17 | } |
17 | } | 18 | |
19 | if (argc > 1 && strcmp(argv[1], "ms") != 0) { | ||
20 | return cmd_results_new(CMD_INVALID, | ||
21 | "Expected 'force_display_urgency_hint <timeout> [ms]'"); | ||
18 | } | 22 | } |
19 | 23 | ||
20 | config->urgent_timeout = timeout > 0 ? timeout : 0; | 24 | config->urgent_timeout = timeout > 0 ? timeout : 0; |