alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Don't use sh when spawning swaybg

Browse source
This commit is contained in:
emersion 2019-01-17 11:20:08 +01:00
parent 808d0e1c51
commit fe3f4882ed
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
1 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
sway/config/output.c
View file

@ -232,28 +232,21 @@ void apply_output_config(struct output_config *oc, struct sway_output *output) {
wlr_log(WLR_DEBUG, "Setting background for output %s to %s", wlr_log(WLR_DEBUG, "Setting background for output %s to %s",
wlr_output->name, oc->background); wlr_output->name, oc->background);
size_t len = snprintf(NULL, 0, "%s \"%s\" \"%s\" %s %s", char *const cmd[] = {
config->swaybg_command, wlr_output->name, oc->background, config->swaybg_command,
wlr_output->name,
oc->background,
oc->background_option, oc->background_option,
oc->background_fallback ? oc->background_fallback : ""); oc->background_fallback ? oc->background_fallback : NULL,
char *command = malloc(len + 1); NULL,
if (!command) { };
wlr_log(WLR_DEBUG, "Unable to allocate swaybg command");
return;
}
snprintf(command, len + 1, "%s \"%s\" \"%s\" %s %s",
config->swaybg_command, wlr_output->name, oc->background,
oc->background_option,
oc->background_fallback ? oc->background_fallback : "");
wlr_log(WLR_DEBUG, "-> %s", command);
char *const cmd[] = { "sh", "-c", command, NULL };
output->bg_pid = fork(); output->bg_pid = fork();
if (output->bg_pid == 0) { if (output->bg_pid < 0) {
wlr_log_errno(WLR_ERROR, "fork failed");
} else if (output->bg_pid == 0) {
execvp(cmd[0], cmd); execvp(cmd[0], cmd);
wlr_log_errno(WLR_ERROR, "Failed to execute swaybg"); wlr_log_errno(WLR_ERROR, "Failed to execute swaybg");
} else {
free(command);
} }
} }