fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Redirect standard descriptors for hook/notify commands

Browse Source 
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 <lfleischer@calcurse.org>
This commit is contained in:
Lukas Fleischer
2021-04-04 11:26:46 -04:00
parent 5710a8bd7f
commit 193ad3415a
3 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/notify.c
View File

@@ -137,9 +137,6 @@ void notify_init_vars(void)
strncpy(nbar.cmd, cmd, BUFSIZ);
nbar.cmd[BUFSIZ - 1] = '\0';
if ((nbar.shell = getenv("SHELL")) == NULL)
nbar.shell = "/bin/sh";
nbar.notify_all = 0;
pthread_attr_init(&detached_thread_attr);
@@ -216,26 +213,18 @@ void notify_reinit_bar(void)
/* Launch user defined command as a notification. */
unsigned notify_launch_cmd(void)
{
int pid;
char const *arg[2] = { nbar.cmd, NULL };
int pid, pin, pout, perr;
if (notify_app.state & APOINT_NOTIFIED)
return 1;
notify_app.state |= APOINT_NOTIFIED;
pid = fork();
if (pid < 0) {
ERROR_MSG(_("error while launching command: could not fork"));
return 0;
} else if (pid == 0) {
/* Child: launch user defined command */
if (execlp(nbar.shell, nbar.shell, "-c", nbar.cmd, NULL) <
0) {
ERROR_MSG(_("error while launching command"));
_exit(1);
}
_exit(0);
if ((pid = shell_exec(&pin, &pout, &perr, *arg, arg))) {
close(pin);
close(pout);
close(perr);
}
return 1;