|
|
@ -11,6 +11,7 @@
|
|
|
|
#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);
|
|
|
@ -62,7 +63,8 @@ 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) {
|
|
|
|
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);
|
|
|
|
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;
|
|
|
|
size_t n = strlen(path) + 1;
|
|
|
|
char *tmp = malloc(n + extra_size);
|
|
|
|
char *tmp = malloc(n + extra_size);
|
|
|
|
if (!tmp) {
|
|
|
|
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);
|
|
|
|
strncpy(tmp, path, n);
|
|
|
@ -81,7 +84,8 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
|
|
|
|
strcat(path, extra_path);
|
|
|
|
strcat(path, extra_path);
|
|
|
|
if (!setenv("PATH", path, 1)) {
|
|
|
|
if (!setenv("PATH", path, 1)) {
|
|
|
|
free(path);
|
|
|
|
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);
|
|
|
|
free(path);
|
|
|
|
|
|
|
|
|
|
|
|