mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This reverts commit 177c67e6b8.
This commit is contained in:
Rostislav Pehlivanov 2018-05-06 00:19:29 +01:00
parent ac903c8752
commit cf602687c6
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sway/commands/exec_always.c
View File

@ -11,7 +11,6 @@
#include "log.h" #include "log.h"
#include "stringop.h" #include "stringop.h"
struct cmd_results *cmd_exec_always(int argc, char **argv) { struct cmd_results *cmd_exec_always(int argc, char **argv) {
struct cmd_results *error = NULL; struct cmd_results *error = NULL;
if (!config->active) return cmd_results_new(CMD_DEFER, NULL, 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); size_t n = confstr(_CS_PATH, NULL, 0);
path = malloc(n + extra_size); path = malloc(n + extra_size);
if (!path) { if (!path) {
wlr_log(L_ERROR, "exec_always: Unable to allocate PATH"); return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to allocate PATH");
exit(EXIT_FAILURE);
} }
confstr(_CS_PATH, path, n); 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; size_t n = strlen(path) + 1;
char *tmp = malloc(n + extra_size); char *tmp = malloc(n + extra_size);
if (!tmp) { if (!tmp) {
wlr_log(L_ERROR, "exec_always: Unable to allocate PATH"); return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to allocate PATH");
exit(EXIT_FAILURE);
} }
strncpy(tmp, path, n); strncpy(tmp, path, n);
@ -84,8 +81,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
strcat(path, extra_path); strcat(path, extra_path);
if (setenv("PATH", path, 1) == -1) { if (setenv("PATH", path, 1) == -1) {
free(path); free(path);
wlr_log(L_ERROR, "exec_always: Unable to set PATH"); return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to set PATH");
exit(EXIT_FAILURE);
} }
free(path); free(path);