mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-14 06:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "exec_always: Search for executables in /usr/lib/sway"

Browse Source 
This reverts commit 7709340727.
This commit is contained in:
Rostislav Pehlivanov 2018-05-06 00:20:49 +01:00
parent 2c0c3dc7cc
commit b592351eef
1 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sway/commands/exec_always.c
View File

@ -51,41 +51,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
if ((pid = fork()) == 0) { if ((pid = fork()) == 0) {
// Fork child process again // Fork child process again
setsid(); setsid();
if ((*child = fork()) == 0) { 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); execl("/bin/sh", "/bin/sh", "-c", cmd, (void *)NULL);
// Not reached // Not reached
} }