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

Add parameter to redirect stderr to shell_exec()

Browse Source 
Add a function parameter to allows redirecting stderr in addition to
stdin and stdout. The parameter will be used with a follow-up change.

Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lukas Fleischer 2021-04-04 10:43:26 -04:00
parent f41955e491
commit 5710a8bd7f
6 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calcurse.h
View File

@ -1251,9 +1251,9 @@ int parse_date_increment(const char *, unsigned *, time_t);
int parse_datetime(const char *, time_t *, time_t);
void file_close(FILE *, const char *);
void psleep(unsigned);
int fork_exec(int *, int *, const char *, const char *const *);
int shell_exec(int *, int *, const char *, const char *const *);
int child_wait(int *, int *, int);
int fork_exec(int *, int *, int *, const char *, const char *const *);
int shell_exec(int *, int *, int *, const char *, const char *const *);
int child_wait(int *, int *, int *, int);
void press_any_key(void);
void print_apoint(const char *, time_t, struct apoint *);
void print_event(const char *, time_t, struct event *);

4
src/hooks.c
View File

@ -53,8 +53,8 @@ int run_hook(const char *name)
arg[0] = hook_cmd;
arg[1] = NULL;
if ((pid = shell_exec(NULL, NULL, *arg, arg))) {
ret = child_wait(NULL, NULL, pid);
if ((pid = shell_exec(NULL, NULL, NULL, *arg, arg))) {
ret = child_wait(NULL, NULL, NULL, pid);
if (ret > 0 && WIFEXITED(ret)) {
asprintf(&mesg, "%s hook: exit status %d",
name,

4
src/ui-day.c
View File

@ -1067,7 +1067,7 @@ void ui_day_item_pipe(void)
return;
wins_prepare_external();
if ((pid = shell_exec(NULL, &pout, *arg, arg))) {
if ((pid = shell_exec(NULL, &pout, NULL, *arg, arg))) {
fpout = fdopen(pout, "w");
switch (p->type) {
@ -1088,7 +1088,7 @@ void ui_day_item_pipe(void)
}
fclose(fpout);
child_wait(NULL, &pout, pid);
child_wait(NULL, &pout, NULL, pid);
press_any_key();
}
wins_unprepare_external();

4
src/ui-todo.c
View File

@ -158,11 +158,11 @@ void ui_todo_pipe(void)
return;
wins_prepare_external();
if ((pid = shell_exec(NULL, &pout, *arg, arg))) {
if ((pid = shell_exec(NULL, &pout, NULL, *arg, arg))) {
fpout = fdopen(pout, "w");
todo_write(item, fpout);
fclose(fpout);
child_wait(NULL, &pout, pid);
child_wait(NULL, &pout, NULL, pid);
press_any_key();
}
wins_unprepare_external();

33
src/utils.c
View File

@ -1317,21 +1317,30 @@ void psleep(unsigned secs)
/*
* Fork and execute an external process.
*
* If pfdin and/or pfdout point to a valid address, a pipe is created and the
* appropriate file descriptors are written to pfdin/pfdout.
* If pfdin/pfdout/pfderr point to a valid address, a pipe is created and the
* appropriate file descriptors are written to pfdin/pfdout/pfderr.
*/
int fork_exec(int *pfdin, int *pfdout, const char *path,
int fork_exec(int *pfdin, int *pfdout, int *pfderr, const char *path,
const char *const *arg)
{
int pin[2], pout[2];
int pin[2], pout[2], perr[2];
int pid;
if (pfdin && (pipe(pin) == -1))
return 0;
if (pfdout && (pipe(pout) == -1))
return 0;
if (pfderr && (pipe(perr) == -1))
return 0;
if ((pid = fork()) == 0) {
if (pfderr) {
if (dup2(perr[0], STDERR_FILENO) < 0)
_exit(127);
close(perr[0]);
close(perr[1]);
}
if (pfdout) {
if (dup2(pout[0], STDIN_FILENO) < 0)
_exit(127);
@ -1353,6 +1362,8 @@ int fork_exec(int *pfdin, int *pfdout, const char *path,
close(pin[1]);
if (pfdout)
close(pout[0]);
if (pfderr)
close(perr[0]);
if (pid > 0) {
if (pfdin) {
@ -1363,11 +1374,17 @@ int fork_exec(int *pfdin, int *pfdout, const char *path,
fcntl(pout[1], F_SETFD, FD_CLOEXEC);
*pfdout = pout[1];
}
if (pfderr) {
fcntl(perr[1], F_SETFD, FD_CLOEXEC);
*pfderr = perr[1];
}
} else {
if (pfdin)
close(pin[0]);
if (pfdout)
close(pout[1]);
if (pfderr)
close(perr[1]);
return 0;
}
}
@ -1376,7 +1393,7 @@ int fork_exec(int *pfdin, int *pfdout, const char *path,
/* Execute an external program in a shell. */
int
shell_exec(int *pfdin, int *pfdout, const char *path,
shell_exec(int *pfdin, int *pfdout, int *pfderr, const char *path,
const char *const *arg)
{
int argc, i;
@ -1406,7 +1423,7 @@ shell_exec(int *pfdin, int *pfdout, const char *path,
narg[3] = NULL;
}
ret = fork_exec(pfdin, pfdout, *narg, narg);
ret = fork_exec(pfdin, pfdout, pfderr, *narg, narg);
if (arg0)
mem_free(arg0);
@ -1416,7 +1433,7 @@ shell_exec(int *pfdin, int *pfdout, const char *path,
}
/* Wait for a child process to terminate. */
int child_wait(int *pfdin, int *pfdout, int pid)
int child_wait(int *pfdin, int *pfdout, int *pfderr, int pid)
{
int stat;
@ -1424,6 +1441,8 @@ int child_wait(int *pfdin, int *pfdout, int pid)
close(*pfdin);
if (pfdout)
close(*pfdout);
if (pfderr)
close(*pfderr);
if (waitpid(pid, &stat, 0) == pid)
return stat;

4
src/wins.c
View File

@ -624,8 +624,8 @@ void wins_launch_external(const char *arg[])
int pid;
wins_prepare_external();
if ((pid = shell_exec(NULL, NULL, *arg, arg)))
child_wait(NULL, NULL, pid);
if ((pid = shell_exec(NULL, NULL, NULL, *arg, arg)))
child_wait(NULL, NULL, NULL, pid);
wins_unprepare_external();
}