mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2537 from ianyfan/commands 

commands: fix exec quoting
This commit is contained in:
Drew DeVault 2018-08-29 08:42:03 -04:00 committed by GitHub
parent 3686724c9e 79899064b6
commit de9e80459a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sway/commands/exec_always.c
View File

@ -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 {