From 193ad3415a0e76bf046bfcc3f03dd65742f18589 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Sun, 4 Apr 2021 11:26:46 -0400 Subject: Redirect standard descriptors for hook/notify commands Disconnect stdin, stdout and stderr when running an external hook or notification command. The previous solution of appending "<&- >&- 2>&-" to the shell command line does not work if the command includes pipes. Use shell_exec() in notify_launch_cmd() instead of a custom (and incomplete) reimplementation of that command. Partially addresses GitHub issue #326. Signed-off-by: Lukas Fleischer --- src/hooks.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/hooks.c') diff --git a/src/hooks.c b/src/hooks.c index cf1db5e..35d8a1a 100644 --- a/src/hooks.c +++ b/src/hooks.c @@ -41,20 +41,18 @@ int run_hook(const char *name) { - char *hook_path = NULL, *hook_cmd = NULL, *mesg; + char *hook_path = NULL, *mesg; + int pid, pin, pout, perr, ret = -127; char const *arg[2]; - int pid, ret = -127; asprintf(&hook_path, "%s/%s", path_hooks, name); if (!io_file_exists(hook_path)) goto cleanup; - - asprintf(&hook_cmd, "%s <&- >&- 2>&-", hook_path); - arg[0] = hook_cmd; + arg[0] = hook_path; arg[1] = NULL; - if ((pid = shell_exec(NULL, NULL, NULL, *arg, arg))) { - ret = child_wait(NULL, NULL, NULL, pid); + if ((pid = shell_exec(&pin, &pout, &perr, *arg, arg))) { + ret = child_wait(&pin, &pout, &perr, pid); if (ret > 0 && WIFEXITED(ret)) { asprintf(&mesg, "%s hook: exit status %d", name, @@ -71,6 +69,5 @@ int run_hook(const char *name) cleanup: mem_free(hook_path); - mem_free(hook_cmd); return ret; } -- cgit v1.2.3-54-g00ecf