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

commands: unescape '\' from IPC commands as well

Browse source 
Fixes #5652.
Was not consistent with handling of commands read from config file
This commit is contained in:
Fenveireth 2021-03-20 12:08:57 +00:00
parent 6059c744f8
commit 13eb87fdab
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sway/commands.c
View file

@ -255,18 +255,10 @@ list_t *execute_command(char *_exec, struct sway_seat *seat,
continue; continue;
} }
sway_log(SWAY_INFO, "Handling command '%s'", cmd); sway_log(SWAY_INFO, "Handling command '%s'", cmd);
//TODO better handling of argv //TODO better handling of argv
int argc; int argc;
char **argv = split_args(cmd, &argc); char **argv = split_args(cmd, &argc);
if (strcmp(argv[0], "exec") != 0 &&
strcmp(argv[0], "exec_always") != 0 &&
strcmp(argv[0], "mode") != 0) {
for (int i = 1; i < argc; ++i) {
if (*argv[i] == '\"' || *argv[i] == '\'') {
strip_quotes(argv[i]);
}
}
}
const struct cmd_handler *handler = find_core_handler(argv[0]); const struct cmd_handler *handler = find_core_handler(argv[0]);
if (!handler) { if (!handler) {
list_add(res_list, cmd_results_new(CMD_INVALID, list_add(res_list, cmd_results_new(CMD_INVALID,
@ -280,6 +272,15 @@ list_t *execute_command(char *_exec, struct sway_seat *seat,
argv[i] = do_var_replacement(argv[i]); argv[i] = do_var_replacement(argv[i]);
} }
// Unescape
for (int i = 1; i < argc; ++i) {
if (handler->handle != cmd_exec && handler->handle != cmd_exec_always
&& handler->handle != cmd_mode
&& (*argv[i] == '\"' || *argv[i] == '\'')) {
strip_quotes(argv[i]);
}
unescape_string(argv[i]);
}
if (!using_criteria) { if (!using_criteria) {
if (con) { if (con) {