sway

commit 177c67e6b89404d9d477b82c00c1353cd4696096
parent 830c4ef74c00dbe448da46cdbc576178abc5728e
Author: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Date:   Wed,  2 May 2018 12:33:16 +0200

command/exec_always: Use wlr_log for logging errors in the child process

Diffstat:
M
sway/commands/exec_always.c
 | 
10
+++++++---

1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c
@@ -11,6 +11,7 @@
 #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);
@@ -62,7 +63,8 @@ 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) {
-					return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to allocate PATH");
+					wlr_log(L_ERROR, "exec_always: Unable to allocate PATH");
+					exit(EXIT_FAILURE);
 				}
 				confstr(_CS_PATH, path, n);
 
@@ -70,7 +72,8 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
 				size_t n = strlen(path) + 1;
 				char *tmp = malloc(n + extra_size);
 				if (!tmp) {
-					return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to allocate PATH");
+					wlr_log(L_ERROR, "exec_always: Unable to allocate PATH");
+					exit(EXIT_FAILURE);
 				}
 
 				strncpy(tmp, path, n);
@@ -81,7 +84,8 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
 			strcat(path, extra_path);
 			if (!setenv("PATH", path, 1)) {
 				free(path);
-				return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to set PATH");
+				wlr_log(L_ERROR, "exec_always: Unable to set PATH");
+				exit(EXIT_FAILURE);
 			}
 			free(path);