mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-03 09:01:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't escape swaybg arguments anymore

Browse source 
swaybg used to be invoked with sh, which made escaping necessary. This is no
longer necessary.

Fixes https://github.com/swaywm/sway/issues/3456
This commit is contained in:
emersion 2019-01-18 09:22:33 +01:00
parent 5a0c4234b8
commit d803861504
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
1 changed files with 2 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -34,8 +34,7 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
struct output_config *output = config->handler_context.output_config; struct output_config *output = config->handler_context.output_config;
if (strcasecmp(argv[1], "solid_color") == 0) { if (strcasecmp(argv[1], "solid_color") == 0) {
output->background = calloc(1, strlen(argv[0]) + 3); output->background = strdup(argv[0]);
snprintf(output->background, strlen(argv[0]) + 3, "\"%s\"", argv[0]);
output->background_option = strdup("solid_color"); output->background_option = strdup("solid_color");
output->background_fallback = NULL; output->background_fallback = NULL;
argc -= 2; argv += 2; argc -= 2; argv += 2;
@ -119,16 +118,6 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
src); src);
free(src); free(src);
} else { } else {
// Escape double quotes in the final path for swaybg
for (size_t i = 0; i < strlen(src); i++) {
if (src[i] == '"') {
src = realloc(src, strlen(src) + 2);
memmove(src + i + 1, src + i, strlen(src + i) + 1);
*(src + i) = '\\';
i++;
}
}
output->background = src; output->background = src;
output->background_option = strdup(mode); output->background_option = strdup(mode);
} }
@ -136,9 +125,7 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
output->background_fallback = NULL; output->background_fallback = NULL;
if (argc && *argv[0] == '#') { if (argc && *argv[0] == '#') {
output->background_fallback = calloc(1, strlen(argv[0]) + 3); output->background_fallback = strdup(argv[0]);
snprintf(output->background_fallback, strlen(argv[0]) + 3,
"\"%s\"", argv[0]);
argc--; argv++; argc--; argv++;
if (!can_access) { if (!can_access) {
@ -153,4 +140,3 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
config->handler_context.leftovers.argv = argv; config->handler_context.leftovers.argv = argv;
return NULL; return NULL;
} }