aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-07-15 10:39:10 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-07-15 10:39:10 +0000
commit9cdccdd2ac5140a5a265926501a919a3b86f8d84 (patch)
tree6e953dd44d95a1b34f667e4566faadaf340d1087
parentterm: add term_scrollback_to_text() and term_view_to_text() (diff)
term: break out fork+exec functionality to a separate file
-rw-r--r--meson.build1
-rw-r--r--spawn.c72
-rw-r--r--spawn.h6
-rw-r--r--terminal.c56
4 files changed, 82 insertions, 53 deletions
diff --git a/meson.build b/meson.build
index a64f239f..a7db2105 100644
--- a/meson.build
+++ b/meson.build
@@ -123,6 +123,7 @@ executable(
'sixel.c', 'sixel.h',
'sixel-hls.c', 'sixel-hls.h',
'slave.c', 'slave.h',
+ 'spawn.c', 'spawn.h',
'terminal.c', 'terminal.h',
'tokenize.c', 'tokenize.h',
'vt.c', 'vt.h',
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 <unistd.h>
+#include <errno.h>
+#include <assert.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#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;
+}
diff --git a/spawn.h b/spawn.h
new file mode 100644
index 00000000..129cadc2
--- /dev/null
+++ b/spawn.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#include <stdbool.h>
+#include "reaper.h"
+
+bool spawn(struct reaper *reaper, const char *cwd, char *const argv[]);
diff --git a/terminal.c b/terminal.c
index d237de97..53640baa 100644
--- a/terminal.c
+++ b/terminal.c
@@ -30,6 +30,7 @@
#include "selection.h"
#include "sixel.h"
#include "slave.h"
+#include "spawn.h"
#include "util.h"
#include "vt.h"
@@ -2246,59 +2247,8 @@ term_flash(struct terminal *term, unsigned duration_ms)
bool
term_spawn_new(const struct terminal *term)
{
- 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 new terminal");
- goto err;
- }
-
- if (pid == 0) {
- /* Child */
- close(pipe_fds[0]);
- if (chdir(term->cwd) < 0 ||
- execlp(term->foot_exe, term->foot_exe, NULL) < 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(term->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 new terminal", _errno, term->foot_exe);
- 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;
+ return spawn(
+ term->reaper, term->cwd, (char *const []){term->foot_exe, NULL});
}
void