diff options
author | Drew DeVault <sir@cmpwn.com> | 2015-10-18 14:03:48 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2015-10-18 14:03:48 -0400 |
commit | ee9b9414b9356593be835c16c68bfc73aad63425 (patch) | |
tree | 9fda6070aa8ee5291121203caea07382279c0a36 | |
parent | Merge pull request #193 from sce/multi_user (diff) | |
parent | commands: Catch empty exec with --no-startup-id cases. (diff) | |
download | sway-ee9b9414b9356593be835c16c68bfc73aad63425.tar.gz sway-ee9b9414b9356593be835c16c68bfc73aad63425.tar.zst sway-ee9b9414b9356593be835c16c68bfc73aad63425.zip |
Merge pull request #194 from sce/ignore_no_startup_id
Ignore exec switch "--no-startup-id".
-rw-r--r-- | sway/commands.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/sway/commands.c b/sway/commands.c index 2358b9e9..5afddc4a 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
@@ -186,8 +186,21 @@ 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 | |||
194 | if (!checkarg(argc - 1, "exec_always", EXPECTED_MORE_THAN, 0)) { | ||
195 | return CMD_FAILURE; | ||
196 | } | ||
197 | |||
198 | tmp = join_args(argv + 1, argc - 1); | ||
199 | } else { | ||
200 | tmp = join_args(argv, argc); | ||
201 | } | ||
202 | |||
189 | // Put argument into cmd array | 203 | // Put argument into cmd array |
190 | char *tmp = join_args(argv, argc); | ||
191 | char cmd[4096]; | 204 | char cmd[4096]; |
192 | strcpy(cmd, tmp); | 205 | strcpy(cmd, tmp); |
193 | free(tmp); | 206 | free(tmp); |