aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-07-15 11:33:56 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-07-15 11:33:56 +0000
commit69d9ff3f2573dc46d558a5134a93165a7ec212d0 (patch)
tree88963222569800edc292dc9d2f81f12555fcbe82
parentconfig: add support for appending a 'spawn' argument to key bindings (diff)
spawn: add optional stdin/stdout/stderr redirection FDs
If not -1, spawn() will redirect the child's stdin/stdout/stderr to these FDs.
-rw-r--r--spawn.c10
-rw-r--r--spawn.h3
-rw-r--r--terminal.c3
3 files changed, 11 insertions, 5 deletions
diff --git a/spawn.c b/spawn.c
index 94bbb928..b268bfe5 100644
--- a/spawn.c
+++ b/spawn.c
@@ -13,7 +13,8 @@
#include "log.h"
bool
-spawn(struct reaper *reaper, const char *cwd, char *const argv[])
+spawn(struct reaper *reaper, const char *cwd, char *const argv[],
+ int stdin_fd, int stdout_fd, int stderr_fd)
{
int pipe_fds[2] = {-1, -1};
if (pipe2(pipe_fds, O_CLOEXEC) < 0) {
@@ -30,8 +31,11 @@ spawn(struct reaper *reaper, const char *cwd, char *const argv[])
if (pid == 0) {
/* Child */
close(pipe_fds[0]);
- if ((cwd != NULL && chdir(cwd) < 0) ||
- //execlp(term->foot_exe, term->foot_exe, NULL) < 0)
+
+ if ((stdin_fd >= 0 && (dup2(stdin_fd, STDIN_FILENO) < 0 || close(stdin_fd) < 0)) ||
+ (stdout_fd >= 0 && (dup2(stdout_fd, STDOUT_FILENO) < 0 || close(stdout_fd) < 0)) ||
+ (stderr_fd >= 0 && (dup2(stderr_fd, STDERR_FILENO) < 0 || close(stderr_fd) < 0)) ||
+ (cwd != NULL && chdir(cwd) < 0) ||
execvp(argv[0], argv) < 0)
{
(void)!write(pipe_fds[1], &errno, sizeof(errno));
diff --git a/spawn.h b/spawn.h
index 129cadc2..2ab645a8 100644
--- a/spawn.h
+++ b/spawn.h
@@ -3,4 +3,5 @@
#include <stdbool.h>
#include "reaper.h"
-bool spawn(struct reaper *reaper, const char *cwd, char *const argv[]);
+bool spawn(struct reaper *reaper, const char *cwd, char *const argv[],
+ int stdin_fd, int stdout_fd, int stderr_fd);
diff --git a/terminal.c b/terminal.c
index 53640baa..c720aea4 100644
--- a/terminal.c
+++ b/terminal.c
@@ -2248,7 +2248,8 @@ bool
term_spawn_new(const struct terminal *term)
{
return spawn(
- term->reaper, term->cwd, (char *const []){term->foot_exe, NULL});
+ term->reaper, term->cwd, (char *const []){term->foot_exe, NULL},
+ -1, -1, -1);
}
void