From 79899064b6ddf4149e80948462ab0b1e722be770 Mon Sep 17 00:00:00 2001 From: Ian Fan Date: Tue, 28 Aug 2018 15:19:52 +0100 Subject: commands: fix exec quoting --- sway/commands/exec_always.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'sway/commands/exec_always.c') 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) { } char *tmp = NULL; - if (strcmp((char*)*argv, "--no-startup-id") == 0) { + if (strcmp(argv[0], "--no-startup-id") == 0) { wlr_log(WLR_INFO, "exec switch '--no-startup-id' not supported, ignored."); - if ((error = checkarg(argc - 1, "exec_always", EXPECTED_MORE_THAN, 0))) { + --argc; ++argv; + if ((error = checkarg(argc, "exec_always", EXPECTED_MORE_THAN, 0))) { return error; } - - --argc; ++argv; } - if (argv[0][0] == '\'' || argv[0][0] == '"') { - if (argc > 0) { - return cmd_results_new(CMD_INVALID, "exec_always", - "command cannot be partially quoted"); - } + if (argc == 1 && (argv[0][0] == '\'' || argv[0][0] == '"')) { tmp = strdup(argv[0]); strip_quotes(tmp); } else { -- cgit v1.2.3-54-g00ecf