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

Merge pull request #2629 from RedSoxFan/fix-654

Browse source 
Allow spaces in background file path
This commit is contained in:
Drew DeVault 2018-09-14 15:57:53 -04:00 committed by GitHub
parent 5f9be1e1aa 17fe8924f2
commit f5ecc89c68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
sway/commands/output/background.c
View file

@ -61,8 +61,14 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
"Missing background scaling mode."); "Missing background scaling mode.");
} }
wordexp_t p; wordexp_t p = {0};
char *src = join_args(argv, j); char *src = join_args(argv, j);
while (strstr(src, " ")) {
src = realloc(src, strlen(src) + 2);
char *ptr = strstr(src, " ") + 1;
memmove(ptr + 1, ptr, strlen(ptr) + 1);
*ptr = '\\';
}
if (wordexp(src, &p, 0) != 0 || p.we_wordv[0] == NULL) { if (wordexp(src, &p, 0) != 0 || p.we_wordv[0] == NULL) {
struct cmd_results *cmd_res = cmd_results_new(CMD_INVALID, "output", struct cmd_results *cmd_res = cmd_results_new(CMD_INVALID, "output",
"Invalid syntax (%s)", src); "Invalid syntax (%s)", src);
@ -71,7 +77,7 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
return cmd_res; return cmd_res;
} }
free(src); free(src);
src = strdup(p.we_wordv[0]); src = join_args(p.we_wordv, p.we_wordc);
wordfree(&p); wordfree(&p);
if (!src) { if (!src) {
wlr_log(WLR_ERROR, "Failed to duplicate string"); wlr_log(WLR_ERROR, "Failed to duplicate string");
@ -117,6 +123,22 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
} }
free(src); free(src);
} else { } else {
// Escape spaces and quotes in the final path for swaybg
for (size_t i = 0; i < strlen(src); i++) {
switch (src[i]) {
case ' ':
case '\'':
case '\"':
src = realloc(src, strlen(src) + 2);
memmove(src + i + 1, src + i, strlen(src + i) + 1);
*(src + i) = '\\';
i++;
break;
default:
break;
}
}
output->background = src; output->background = src;
output->background_option = strdup(mode); output->background_option = strdup(mode);
} }