From cf602687c6c77b3292370d0639ab5080b7fd611b Mon Sep 17 00:00:00 2001
From: Rostislav Pehlivanov <atomnuker@gmail.com>
Date: Sun, 6 May 2018 00:19:29 +0100
Subject: Revert "command/exec_always: Use wlr_log for logging errors in the
child process"
This reverts commit 177c67e6b89404d9d477b82c00c1353cd4696096.
---
sway/commands/exec_always.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
(limited to 'sway')
diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c
index f631d7d8..1d95dc96 100644
--- a/sway/commands/exec_always.c
+++ b/sway/commands/exec_always.c
@@ -11,7 +11,6 @@
#include "log.h"
#include "stringop.h"
-
struct cmd_results *cmd_exec_always(int argc, char **argv) {
struct cmd_results *error = NULL;
if (!config->active) return cmd_results_new(CMD_DEFER, NULL, NULL);
@@ -63,8 +62,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
size_t n = confstr(_CS_PATH, NULL, 0);
path = malloc(n + extra_size);
if (!path) {
- wlr_log(L_ERROR, "exec_always: Unable to allocate PATH");
- exit(EXIT_FAILURE);
+ return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to allocate PATH");
}
confstr(_CS_PATH, path, n);
@@ -72,8 +70,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
size_t n = strlen(path) + 1;
char *tmp = malloc(n + extra_size);
if (!tmp) {
- wlr_log(L_ERROR, "exec_always: Unable to allocate PATH");
- exit(EXIT_FAILURE);
+ return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to allocate PATH");
}
strncpy(tmp, path, n);
@@ -84,8 +81,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
strcat(path, extra_path);
if (setenv("PATH", path, 1) == -1) {
free(path);
- wlr_log(L_ERROR, "exec_always: Unable to set PATH");
- exit(EXIT_FAILURE);
+ return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to set PATH");
}
free(path);
--
cgit v1.2.3