mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-16 13:13:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

commands: Ignore exec switch "--no-startup-id".

Browse source 
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.
This commit is contained in:
S. Christoffer Eliesen 2015-10-17 14:28:38 +02:00
parent 16e904634c
commit 71bcee4f96
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sway/commands.c
View file

@ -186,8 +186,16 @@ static enum cmd_status cmd_exec_always(int argc, char **argv) {
if (!checkarg(argc, "exec_always", EXPECTED_MORE_THAN, 0)) { if (!checkarg(argc, "exec_always", EXPECTED_MORE_THAN, 0)) {
return CMD_FAILURE; return CMD_FAILURE;
} }
char *tmp = NULL;
if (strcmp((char*)*argv, "--no-startup-id") == 0) {
sway_log(L_INFO, "exec switch '--no-startup-id' not supported, ignored.");
tmp = join_args(argv + 1, argc - 1);
} else {
tmp = join_args(argv, argc);
}
// Put argument into cmd array // Put argument into cmd array
char *tmp = join_args(argv, argc);
char cmd[4096]; char cmd[4096];
strcpy(cmd, tmp); strcpy(cmd, tmp);
free(tmp); free(tmp);