From 9cdccdd2ac5140a5a265926501a919a3b86f8d84 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 15 Jul 2020 12:39:10 +0200 Subject: term: break out fork+exec functionality to a separate file --- spawn.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 spawn.c (limited to 'spawn.c') diff --git a/spawn.c b/spawn.c new file mode 100644 index 00000000..94bbb928 --- /dev/null +++ b/spawn.c @@ -0,0 +1,72 @@ +#include "spawn.h" + +#include +#include +#include + +#include +#include +#include + +#define LOG_MODULE "spawn" +#define LOG_ENABLE_DBG 0 +#include "log.h" + +bool +spawn(struct reaper *reaper, const char *cwd, char *const argv[]) +{ + int pipe_fds[2] = {-1, -1}; + if (pipe2(pipe_fds, O_CLOEXEC) < 0) { + LOG_ERRNO("failed to create pipe"); + goto err; + } + + pid_t pid = fork(); + if (pid < 0) { + LOG_ERRNO("failed to fork"); + goto err; + } + + if (pid == 0) { + /* Child */ + close(pipe_fds[0]); + if ((cwd != NULL && chdir(cwd) < 0) || + //execlp(term->foot_exe, term->foot_exe, NULL) < 0) + execvp(argv[0], argv) < 0) + { + (void)!write(pipe_fds[1], &errno, sizeof(errno)); + _exit(errno); + } + assert(false); + _exit(errno); + } + + /* Parent */ + close(pipe_fds[1]); + + int _errno; + static_assert(sizeof(_errno) == sizeof(errno), "errno size mismatch"); + + ssize_t ret = read(pipe_fds[0], &_errno, sizeof(_errno)); + close(pipe_fds[0]); + + if (ret == 0) { + reaper_add(reaper, pid); + return true; + } else if (ret < 0) { + LOG_ERRNO("failed to read from pipe"); + return false; + } else { + LOG_ERRNO_P("%s: failed to spawn", _errno, argv[0]); + errno = _errno; + waitpid(pid, NULL, 0); + return false; + } + +err: + if (pipe_fds[0] != -1) + close(pipe_fds[0]); + if (pipe_fds[1] != -1) + close(pipe_fds[1]); + return false; +} -- cgit v1.3 From 69d9ff3f2573dc46d558a5134a93165a7ec212d0 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 15 Jul 2020 13:33:56 +0200 Subject: spawn: add optional stdin/stdout/stderr redirection FDs If not -1, spawn() will redirect the child's stdin/stdout/stderr to these FDs. --- spawn.c | 10 +++++++--- spawn.h | 3 ++- terminal.c | 3 ++- 3 files changed, 11 insertions(+), 5 deletions(-) (limited to 'spawn.c') 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 #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 -- cgit v1.3