X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=madtty%2Fmadtty.c;h=959204d9f0a5d17e52ba5354812cef062ef7ba04;hb=880886ae6dca338d2d57e4b85cf984f4022ec520;hp=ed810d61a1be985ac1ed21a5170f3d07898a2445;hpb=8f56ed8cb875b860ded79f630d439c953bc4aa4d;p=apps%2Fmadtty.git diff --git a/madtty/madtty.c b/madtty/madtty.c index ed810d6..959204d 100644 --- a/madtty/madtty.c +++ b/madtty/madtty.c @@ -19,17 +19,15 @@ Copyright © 2006 Pierre Habouzit */ +#include #include -#ifdef USE_PTY -#include -#endif +#include #include #include +#include #include "madtty.h" -#include "roteprivate.h" - -#define ROTE_VT_UPDATE_ITERATIONS 5 +#include "madtty_priv.h" RoteTerm *rote_vt_create(int rows, int cols) { @@ -73,7 +71,7 @@ RoteTerm *rote_vt_create(int rows, int cols) /* allocate private data */ rt->pd = (RoteTermPrivate*)calloc(sizeof(RoteTermPrivate), 1); - rt->pd->pty = -1; /* no pty for now */ + rt->pty = -1; /* no pty for now */ /* initial scrolling area is the whole window */ rt->pd->scrolltop = 0; @@ -118,9 +116,10 @@ void rote_vt_draw(RoteTerm *rt, WINDOW *win, int srow, int scol, void (*cur_set_attr)(WINDOW*,unsigned char)) { int i, j; - rote_vt_update(rt); - if (!cur_set_attr) cur_set_attr = default_cur_set_attr; + if (!cur_set_attr) + cur_set_attr = default_cur_set_attr; + for (i = 0; i < rt->rows; i++) { wmove(win, srow + i, scol); for (j = 0; j < rt->cols; j++) { @@ -134,87 +133,120 @@ void rote_vt_draw(RoteTerm *rt, WINDOW *win, int srow, int scol, #endif -#ifdef USE_PTY +/******************************************************/ -pid_t rote_vt_forkpty(RoteTerm *rt, const char *command) +#define PTYCHAR1 "pqrstuvwxyz" +#define PTYCHAR2 "0123456789abcdef" + +/* allocate one pty/tty pair */ +static int get_pty(char *tty_str) { + int fd; + char ptydev[] = "/dev/pty??"; + char ttydev[] = "/dev/tty??"; + int len = strlen(ttydev); + const char *c1, *c2; + + for (c1 = PTYCHAR1; *c1; c1++) { + ptydev[len-2] = ttydev[len-2] = *c1; + for (c2 = PTYCHAR2; *c2; c2++) { + ptydev[len-1] = ttydev[len-1] = *c2; + if ((fd = open(ptydev, O_RDWR)) >= 0) { + if (access(ttydev, R_OK|W_OK) == 0) { + strcpy(tty_str, ttydev); + return fd; + } + close(fd); + } + } + } + return -1; +} + +static int +run_process(const char *path, const char **argv, int *fd_ptr, int *pid_ptr) +{ + int pty_fd, pid, i, nb_fds; + char tty_name[32]; struct winsize ws; - pid_t childpid; - ws.ws_row = rt->rows; - ws.ws_col = rt->cols; - ws.ws_xpixel = ws.ws_ypixel = 0; + pty_fd = get_pty(tty_name); + if (pty_fd < 0) + return -1; + + fcntl(pty_fd, F_SETFL, O_NONBLOCK); + + /* set dummy screen size */ + ws.ws_col = 80; + ws.ws_row = 25; + ws.ws_xpixel = ws.ws_col; + ws.ws_ypixel = ws.ws_row; + ioctl(pty_fd, TIOCSWINSZ, &ws); - childpid = forkpty(&rt->pd->pty, NULL, NULL, &ws); - if (childpid < 0) + pid = fork(); + if (pid < 0) return -1; - if (childpid == 0) { - /* we are the child, running under the slave side of the pty. */ + if (pid == 0) { + /* child process */ + nb_fds = getdtablesize(); + for (i = 0; i < nb_fds; i++) + close(i); + /* open pseudo tty for standard i/o */ + open(tty_name, O_RDWR); + dup(0); + dup(0); + + setsid(); - /* Cajole application into using linux-console-compatible escape - * sequences (which is what we are prepared to interpret) */ setenv("TERM", "linux", 1); + execv(path, (char *const*)argv); + fprintf(stderr, "\nexecv() failed.\nCommand: '%s'\n", argv[0]); + exit(1); + } + /* return file info */ + *fd_ptr = pty_fd; + *pid_ptr = pid; + return 0; +} - /* Now we will exec /bin/sh -c command. */ - execl("/bin/sh", "/bin/sh", "-c", command, NULL); +pid_t rote_vt_forkpty(RoteTerm *rt, const char *path, const char *argv[]) +{ + struct winsize ws; + + ws.ws_row = rt->rows; + ws.ws_col = rt->cols; + ws.ws_xpixel = ws.ws_ypixel = 0; - fprintf(stderr, "\nexecl() failed.\nCommand: '%s'\n", command); - exit(127); /* error exec'ing */ + if (run_process(path, argv, &rt->pty, &rt->childpid)) { + return -1; } - /* if we got here we are the parent process */ - return (rt->childpid = childpid); + ioctl(rt->pty, TIOCSWINSZ, &ws); + return rt->childpid; } void rote_vt_forsake_child(RoteTerm *rt) { - if (rt->pd->pty >= 0) - close(rt->pd->pty); - rt->pd->pty = -1; + if (rt->pty >= 0) + close(rt->pty); + rt->pty = -1; rt->childpid = 0; } -#endif - -void rote_vt_update(RoteTerm *rt) +int rote_vt_read(RoteTerm *rt, char *buf, int buflen) { - fd_set ifs; - struct timeval tvzero; - char buf[512]; - int bytesread; - int n = ROTE_VT_UPDATE_ITERATIONS; - if (rt->pd->pty < 0) - return; /* nothing to pump */ - - while (n--) { /* iterate at most ROVE_VT_UPDATE_ITERATIONS times. - * As Phil Endecott pointed out, if we don't restrict this, - * a program that floods the terminal with output - * could cause this loop to iterate forever, never - * being able to catch up. So we'll rely on the client - * calling rote_vt_update often, as the documentation - * recommends :-) */ - - /* check if pty has something to say */ - FD_ZERO(&ifs); FD_SET(rt->pd->pty, &ifs); - tvzero.tv_sec = 0; tvzero.tv_usec = 0; - - if (select(rt->pd->pty + 1, &ifs, NULL, NULL, &tvzero) <= 0) - return; /* nothing to read, or select() failed */ - - /* read what we can. This is guaranteed not to block, since - * select() told us there was something to read. */ - bytesread = read(rt->pd->pty, buf, 512); - if (bytesread <= 0) return; - - /* inject the data into the terminal */ - rote_vt_inject(rt, buf, bytesread); + if (rt->pty < 0) { + errno = EINVAL; + return -1; } + + return read(rt->pty, buf, buflen); } void rote_vt_write(RoteTerm *rt, const char *data, int len) { - if (rt->pd->pty < 0) { + if (rt->pty < 0) { /* no pty, so just inject the data plain and simple */ rote_vt_inject(rt, data, len); return; @@ -223,7 +255,7 @@ void rote_vt_write(RoteTerm *rt, const char *data, int len) /* write data to pty. Keep calling write() until we have written * everything. */ while (len > 0) { - int byteswritten = write(rt->pd->pty, data, len); + int byteswritten = write(rt->pty, data, len); if (byteswritten < 0) { /* very ugly way to inform the error. Improvements welcome! */ static char errormsg[] = "\n(ROTE: pty write() error)\n"; @@ -236,11 +268,6 @@ void rote_vt_write(RoteTerm *rt, const char *data, int len) } } -void rote_vt_install_handler(RoteTerm *rt, rote_es_handler_t handler) -{ - rt->pd->handler = handler; -} - void *rote_vt_take_snapshot(RoteTerm *rt) { const int bytes_per_row = sizeof(RoteCell) * rt->cols; @@ -266,11 +293,6 @@ void rote_vt_restore_snapshot(RoteTerm *rt, void *snapbuf) } } -int rote_vt_get_pty_fd(RoteTerm *rt) -{ - return rt->pd->pty; -} - static const char *keytable[KEY_MAX+1]; static void keytable_init() @@ -306,7 +328,7 @@ void rote_vt_keypress(RoteTerm *rt, int keycode) { char c = (char) keycode; - if (keytable['\n'] != NULL) + if (keytable['\n'] == NULL) keytable_init(); if (keycode >= 0 && keycode < KEY_MAX && keytable[keycode]) {