diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-08-29 08:42:03 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-29 08:42:03 -0400 |
commit | de9e80459a93598bdaf6a68485215ce597131d88 (patch) | |
tree | d6ba71af9572c348ac04f8415272234b890a9e7d | |
parent | Merge pull request #2531 from RyanDwyer/maybe-fix-transaction-crash (diff) | |
parent | commands: fix exec quoting (diff) | |
download | sway-de9e80459a93598bdaf6a68485215ce597131d88.tar.gz sway-de9e80459a93598bdaf6a68485215ce597131d88.tar.zst sway-de9e80459a93598bdaf6a68485215ce597131d88.zip |
Merge pull request #2537 from ianyfan/commands
commands: fix exec quoting
-rw-r--r-- | sway/commands/exec_always.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c index bc07c2aa..de78dd83 100644 --- a/sway/commands/exec_always.c +++ b/sway/commands/exec_always.c | |||
@@ -21,20 +21,15 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { | |||
21 | } | 21 | } |
22 | 22 | ||
23 | char *tmp = NULL; | 23 | char *tmp = NULL; |
24 | if (strcmp((char*)*argv, "--no-startup-id") == 0) { | 24 | if (strcmp(argv[0], "--no-startup-id") == 0) { |
25 | wlr_log(WLR_INFO, "exec switch '--no-startup-id' not supported, ignored."); | 25 | wlr_log(WLR_INFO, "exec switch '--no-startup-id' not supported, ignored."); |
26 | if ((error = checkarg(argc - 1, "exec_always", EXPECTED_MORE_THAN, 0))) { | 26 | --argc; ++argv; |
27 | if ((error = checkarg(argc, "exec_always", EXPECTED_MORE_THAN, 0))) { | ||
27 | return error; | 28 | return error; |
28 | } | 29 | } |
29 | |||
30 | --argc; ++argv; | ||
31 | } | 30 | } |
32 | 31 | ||
33 | if (argv[0][0] == '\'' || argv[0][0] == '"') { | 32 | if (argc == 1 && (argv[0][0] == '\'' || argv[0][0] == '"')) { |
34 | if (argc > 0) { | ||
35 | return cmd_results_new(CMD_INVALID, "exec_always", | ||
36 | "command cannot be partially quoted"); | ||
37 | } | ||
38 | tmp = strdup(argv[0]); | 33 | tmp = strdup(argv[0]); |
39 | strip_quotes(tmp); | 34 | strip_quotes(tmp); |
40 | } else { | 35 | } else { |