From 16dc31f33b201e949f912f993ef927c72a307b88 Mon Sep 17 00:00:00 2001 From: Mykyta Holubakha Date: Mon, 23 May 2016 19:53:27 +0300 Subject: [PATCH] Concatenate output cmd args, fixes #654 --- sway/commands.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sway/commands.c b/sway/commands.c index 9c5309f9..fbdb5fb8 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -1557,14 +1557,15 @@ static struct cmd_results *cmd_output(int argc, char **argv) { if (++i >= argc) { return cmd_results_new(CMD_INVALID, "output", "Missing background file."); } - char *src = argv[i]; - if (++i >= argc) { + if (i + 1 >= argc) { return cmd_results_new(CMD_INVALID, "output", "Missing background scaling mode."); } - char *mode = argv[i]; + char *src = join_args(argv + i, argc - i - 1); + char *mode = argv[argc - 1]; if (wordexp(src, &p, 0) != 0) { return cmd_results_new(CMD_INVALID, "output", "Invalid syntax (%s)", src); } + free(src); src = p.we_wordv[0]; if (config->reading && *src != '/') { char *conf = strdup(config->current_config);