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

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

This commit is contained in:
Nicolas Braud-Santoni 2018-05-02 12:33:16 +02:00
parent 830c4ef74c
commit 177c67e6b8
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sway/commands/exec_always.c
View File

@ -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);