diff options
author | S. Christoffer Eliesen <christoffer@eliesen.no> | 2015-10-17 14:28:38 +0200 |
---|---|---|
committer | S. Christoffer Eliesen <christoffer@eliesen.no> | 2015-10-17 14:28:38 +0200 |
commit | 71bcee4f96206e9988bc9a1302f6e1fff4526ce3 (patch) | |
tree | 50d4a4f477d70fae23c9cc89df329625d42500ea | |
parent | Merge pull request #193 from sce/multi_user (diff) | |
download | sway-71bcee4f96206e9988bc9a1302f6e1fff4526ce3.tar.gz sway-71bcee4f96206e9988bc9a1302f6e1fff4526ce3.tar.zst sway-71bcee4f96206e9988bc9a1302f6e1fff4526ce3.zip |
commands: Ignore exec switch "--no-startup-id".
When using an i3 config verbatim in sway this switch to exec or
exec_always might appear.
Before this patch the switch would be passed to /bin/sh, causing
an error, and the command would not be run.
-rw-r--r-- | sway/commands.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sway/commands.c b/sway/commands.c index 2358b9e9..41223937 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
@@ -186,8 +186,16 @@ static enum cmd_status cmd_exec_always(int argc, char **argv) { | |||
186 | if (!checkarg(argc, "exec_always", EXPECTED_MORE_THAN, 0)) { | 186 | if (!checkarg(argc, "exec_always", EXPECTED_MORE_THAN, 0)) { |
187 | return CMD_FAILURE; | 187 | return CMD_FAILURE; |
188 | } | 188 | } |
189 | |||
190 | char *tmp = NULL; | ||
191 | if (strcmp((char*)*argv, "--no-startup-id") == 0) { | ||
192 | sway_log(L_INFO, "exec switch '--no-startup-id' not supported, ignored."); | ||
193 | tmp = join_args(argv + 1, argc - 1); | ||
194 | } else { | ||
195 | tmp = join_args(argv, argc); | ||
196 | } | ||
197 | |||
189 | // Put argument into cmd array | 198 | // Put argument into cmd array |
190 | char *tmp = join_args(argv, argc); | ||
191 | char cmd[4096]; | 199 | char cmd[4096]; |
192 | strcpy(cmd, tmp); | 200 | strcpy(cmd, tmp); |
193 | free(tmp); | 201 | free(tmp); |