diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2019-07-17 07:39:12 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2019-07-17 07:39:12 +0000 |
| commit | aa87be43ba0deb9977a7c159367214afbe7a50b4 (patch) | |
| tree | 33674db4f9a752e5d04a6c12474074b0728eba5d | |
| parent | main: jump to cleanup on failure to load cursor pointer theme (diff) | |
slave: report exec() failure back to main process
| -rw-r--r-- | main.c | 54 | ||||
| -rw-r--r-- | slave.c | 3 | ||||
| -rw-r--r-- | slave.h | 2 |
3 files changed, 44 insertions, 15 deletions
@@ -540,21 +540,49 @@ main(int argc, char *const *argv) wl_display_dispatch_pending(term.wl.display); - term.slave = fork(); - switch (term.slave) { - case -1: - LOG_ERRNO("failed to fork"); - goto out; + { + int fork_pipe[2]; + if (pipe2(fork_pipe, O_CLOEXEC) < 0) { + LOG_ERRNO("failed to create pipe"); + goto out; + } - case 0: - /* Child */ - slave_spawn(term.ptmx, conf.shell); - assert(false); - break; + term.slave = fork(); + switch (term.slave) { + case -1: + LOG_ERRNO("failed to fork"); + close(fork_pipe[0]); + close(fork_pipe[1]); + goto out; + + case 0: + /* Child */ + close(fork_pipe[0]); /* Close read end */ + slave_spawn(term.ptmx, conf.shell, fork_pipe[1]); + assert(false); + break; - default: - LOG_DBG("slave has PID %d", term.slave); - break; + default: { + close(fork_pipe[1]); /* Close write end */ + LOG_DBG("slave has PID %d", term.slave); + + int _errno; + static_assert(sizeof(errno) == sizeof(_errno), "errno size mismatch"); + + ssize_t ret = read(fork_pipe[0], &_errno, sizeof(_errno)); + close(fork_pipe[0]); + + if (ret < 0) { + LOG_ERRNO("failed to read from pipe"); + goto out; + } else if (ret == sizeof(_errno)) { + LOG_ERRNO("%s: failed to execute", conf.shell); + goto out; + } else + LOG_DBG("%s: successfully started", conf.shell); + break; + } + } } /* Read logic requires non-blocking mode */ @@ -92,7 +92,7 @@ err: } void -slave_spawn(int ptmx, char *cmd) +slave_spawn(int ptmx, char *cmd, int err_fd) { int pts = -1; const char *pts_name = ptsname(ptmx); @@ -138,6 +138,7 @@ slave_spawn(int ptmx, char *cmd) execvp(argv[0], argv); err: + (void)!write(err_fd, &errno, sizeof(errno)); if (argv) free(argv); if (pts != -1) @@ -1,4 +1,4 @@ #pragma once #include <stdbool.h> -void slave_spawn(int ptmx, char *cmd); +void slave_spawn(int ptmx, char *cmd, int err_fd); |
