From cf602687c6c77b3292370d0639ab5080b7fd611b Mon Sep 17 00:00:00 2001 From: Rostislav Pehlivanov 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/commands') 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 From 0cdc47ab1ec09c9fe64e990a7770dbb15ef85a65 Mon Sep 17 00:00:00 2001 From: Rostislav Pehlivanov Date: Sun, 6 May 2018 00:19:43 +0100 Subject: Revert "Meson: Replace option `instlibdir` with `libexecdir`" This reverts commit 830c4ef74c00dbe448da46cdbc576178abc5728e. --- sway/commands/exec_always.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sway/commands') diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c index 1d95dc96..8483cf26 100644 --- a/sway/commands/exec_always.c +++ b/sway/commands/exec_always.c @@ -55,8 +55,8 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { if ((*child = fork()) == 0) { // Acquire the current PATH char *path = getenv("PATH"); - const char *extra_path = ":" SWAY_LIBEXECDIR; - const size_t extra_size = sizeof(SWAY_LIBEXECDIR) + 1; + const char *extra_path = ":" INSTLIBDIR; + const size_t extra_size = sizeof(INSTLIBDIR) + 1; if (!path) { size_t n = confstr(_CS_PATH, NULL, 0); -- cgit v1.2.3 From 2c0c3dc7cc3599a79fa464e1c093dead86f3cb65 Mon Sep 17 00:00:00 2001 From: Rostislav Pehlivanov Date: Sun, 6 May 2018 00:19:52 +0100 Subject: Revert "Make the LIBDIR path configurable" This reverts commit 1670b46bf6e56d37e69ab0fa32c6799e83397020. --- sway/commands/exec_always.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sway/commands') diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c index 8483cf26..16bbcb61 100644 --- a/sway/commands/exec_always.c +++ b/sway/commands/exec_always.c @@ -55,8 +55,8 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { if ((*child = fork()) == 0) { // Acquire the current PATH char *path = getenv("PATH"); - const char *extra_path = ":" INSTLIBDIR; - const size_t extra_size = sizeof(INSTLIBDIR) + 1; + const char *extra_path = ":/usr/lib/sway"; + const size_t extra_size = sizeof("/usr/lib/sway") + 1; if (!path) { size_t n = confstr(_CS_PATH, NULL, 0); -- cgit v1.2.3 From b592351eeff55a0a95f9b65d403fcfda9cf02957 Mon Sep 17 00:00:00 2001 From: Rostislav Pehlivanov Date: Sun, 6 May 2018 00:20:49 +0100 Subject: Revert "exec_always: Search for executables in /usr/lib/sway" This reverts commit 7709340727fe2834f87b43aeeaef878694d5acd6. --- sway/commands/exec_always.c | 34 ---------------------------------- 1 file changed, 34 deletions(-) (limited to 'sway/commands') diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c index 16bbcb61..af4e4965 100644 --- a/sway/commands/exec_always.c +++ b/sway/commands/exec_always.c @@ -51,41 +51,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { if ((pid = fork()) == 0) { // Fork child process again setsid(); - if ((*child = fork()) == 0) { - // Acquire the current PATH - char *path = getenv("PATH"); - const char *extra_path = ":/usr/lib/sway"; - const size_t extra_size = sizeof("/usr/lib/sway") + 1; - - if (!path) { - 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"); - } - confstr(_CS_PATH, path, n); - - } else { - 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"); - } - - strncpy(tmp, path, n); - path = tmp; - } - - // Append /usr/lib/sway to PATH - strcat(path, extra_path); - if (setenv("PATH", path, 1) == -1) { - free(path); - return cmd_results_new(CMD_FAILURE, "exec_always", "Unable to set PATH"); - } - free(path); - - // Execute the command execl("/bin/sh", "/bin/sh", "-c", cmd, (void *)NULL); // Not reached } -- cgit v1.2.3