1 files changed, 15 insertions, 21 deletions

diff --git a/sway/config/output.c b/sway/config/output.c
index f24e7d66..f23d316d 100644
--- a/sway/config/output.c
+++ b/sway/config/output.c
@@ -229,30 +229,24 @@ void apply_output_config(struct output_config *oc, struct sway_output *output) {
 		terminate_swaybg(output->bg_pid);
 	}
 	if (oc && oc->background && config->swaybg_command) {
-		wlr_log(WLR_DEBUG, "Setting background for output %d to %s",
-				output_i, oc->background);
-
-		size_t len = snprintf(NULL, 0, "%s %d \"%s\" %s %s",
-				config->swaybg_command, output_i, oc->background,
-				oc->background_option,
-				oc->background_fallback ? oc->background_fallback : "");
-		char *command = malloc(len + 1);
-		if (!command) {
-			wlr_log(WLR_DEBUG, "Unable to allocate swaybg command");
-			return;
-		}
-		snprintf(command, len + 1, "%s %d \"%s\" %s %s",
-				config->swaybg_command, output_i, oc->background,
-				oc->background_option,
-				oc->background_fallback ? oc->background_fallback : "");
-		wlr_log(WLR_DEBUG, "-> %s", command);
+		wlr_log(WLR_DEBUG, "Setting background for output %s to %s",
+			wlr_output->name, oc->background);
+
+		char *const cmd[] = {
+			config->swaybg_command,
+			wlr_output->name,
+			oc->background,
+			oc->background_option,
+			oc->background_fallback ? oc->background_fallback : NULL,
+			NULL,
+		};
 
-		char *const cmd[] = { "sh", "-c", command, NULL };
 		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);
-		} else {
-			free(command);
+			wlr_log_errno(WLR_ERROR, "Failed to execute swaybg");
 		}
 	}