From bd48cb5e7df0820a72de27e156426f20e7233e78 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Thu, 6 Sep 2018 00:41:06 -0400 Subject: Move event loop to event.c --- chat.c | 102 ++--------------------------------------------------------------- 1 file changed, 2 insertions(+), 100 deletions(-) (limited to 'chat.c') diff --git a/chat.c b/chat.c index fb9e68f..c7a3229 100644 --- a/chat.c +++ b/chat.c @@ -17,15 +17,11 @@ #define _WITH_GETLINE #include -#include -#include -#include #include #include #include #include #include -#include #include "chat.h" @@ -45,98 +41,6 @@ void selfJoin(const char *join) { if (!self.join) err(EX_OSERR, "strdup"); } -static union { - struct { - struct pollfd ui; - struct pollfd irc; - struct pollfd pipe; - }; - struct pollfd fds[3]; -} fds = { - .ui = { .events = POLLIN, .fd = STDIN_FILENO }, - .irc = { .events = POLLIN }, - .pipe = { .events = 0 }, -}; - -void spawn(char *const argv[]) { - if (fds.pipe.events) { - uiLog(TagStatus, UIWarm, L"spawn: existing pipe"); - return; - } - - int rw[2]; - int error = pipe(rw); - if (error) err(EX_OSERR, "pipe"); - - pid_t pid = fork(); - if (pid < 0) err(EX_OSERR, "fork"); - if (!pid) { - close(rw[0]); - close(STDIN_FILENO); - dup2(rw[1], STDOUT_FILENO); - dup2(rw[1], STDERR_FILENO); - close(rw[1]); - execvp(argv[0], argv); - perror(argv[0]); - exit(EX_CONFIG); - } - - close(rw[1]); - fds.pipe.fd = rw[0]; - fds.pipe.events = POLLIN; -} - -static void pipeRead(void) { - char buf[256]; - ssize_t len = read(fds.pipe.fd, buf, sizeof(buf) - 1); - if (len < 0) err(EX_IOERR, "read"); - if (len) { - buf[len] = '\0'; - len = strcspn(buf, "\n"); - uiFmt(TagStatus, UIWarm, "spawn: %.*s", (int)len, buf); - } else { - close(fds.pipe.fd); - fds.pipe.events = 0; - fds.pipe.revents = 0; - } -} - -static void eventLoop(void) { - for (;;) { - uiDraw(); - - int n = poll(fds.fds, (fds.pipe.events ? 3 : 2), -1); - if (n < 0) { - if (errno != EINTR) err(EX_IOERR, "poll"); - uiRead(); - continue; - } - - if (fds.ui.revents) uiRead(); - if (fds.irc.revents) ircRead(); - if (fds.pipe.revents) pipeRead(); - } -} - -static void sigchld(int sig) { - (void)sig; - int status; - pid_t pid = wait(&status); - if (pid < 0) err(EX_OSERR, "wait"); - if (WIFEXITED(status) && WEXITSTATUS(status)) { - uiFmt(TagStatus, UIWarm, "spawn: exit %d", WEXITSTATUS(status)); - } else if (WIFSIGNALED(status)) { - uiFmt(TagStatus, UIWarm, "spawn: signal %d", WTERMSIG(status)); - } -} - -static void sigint(int sig) { - (void)sig; - input(TagStatus, "/quit"); - uiExit(); - exit(EX_OK); -} - static char *prompt(const char *prompt) { char *line = NULL; size_t cap; @@ -186,10 +90,8 @@ int main(int argc, char *argv[]) { uiLog(TagStatus, UIWarm, L"Traveling..."); uiDraw(); - fds.irc.fd = ircConnect(host, port, pass, webirc); + int irc = ircConnect(host, port, pass, webirc); free(host); - signal(SIGINT, sigint); - signal(SIGCHLD, sigchld); - eventLoop(); + eventLoop(STDIN_FILENO, irc); } -- cgit 1.4.1