diff options
author | Rostislav Pehlivanov <atomnuker@gmail.com> | 2018-05-06 00:20:49 +0100 |
---|---|---|
committer | Rostislav Pehlivanov <atomnuker@gmail.com> | 2018-05-06 00:20:49 +0100 |
commit | b592351eeff55a0a95f9b65d403fcfda9cf02957 (patch) | |
tree | 664422efe55745fabd11a7e2845722b9485e9414 /sway/commands | |
parent | 2c0c3dc7cc3599a79fa464e1c093dead86f3cb65 (diff) | |
download | sway-b592351eeff55a0a95f9b65d403fcfda9cf02957.tar.xz |
Revert "exec_always: Search for executables in /usr/lib/sway"
This reverts commit 7709340727fe2834f87b43aeeaef878694d5acd6.
Diffstat (limited to 'sway/commands')
-rw-r--r-- | sway/commands/exec_always.c | 34 |
1 files changed, 0 insertions, 34 deletions
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 } |