JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
add accidentally omitted word
[st.git] / std.c
diff --git a/std.c b/std.c
index 5bc27b8..55da9d6 100644 (file)
--- a/std.c
+++ b/std.c
@@ -1,8 +1,25 @@
-/* See LICENSE file for copyright and license details. */
+/* See LICENSE file for copyright and license details.
+ *
+ * Simple terminal daemon is a terminal emulator. It can be used in
+ * combination with simple terminal to emulate a mostly VT100-compatible
+ * terminal.
+ * 
+ * In this process std works like a filter. It reads data from a
+ * pseudo-terminal and parses the escape sequences and transforms them
+ * into an ed(1)-like language. The resulting data is buffered and
+ * written to stdout.
+ * Parallely it reads data from stdin and parses and executes the
+ * commands. The resulting data is written to the pseudo-terminal.
+ */
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <ctype.h>
 #include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#if !(_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600)
+#include <pty.h>
+#endif
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
 #define MAX(a,b)       (((a) > (b)) ? (a) : (b))
 #define MIN(a,b)       (((a) < (b)) ? (a) : (b))
 
+typedef struct {
+       unsigned char data[BUFSIZ];
+       int s, e;
+       int n;
+} RingBuffer;
+
 static void buffer(char c);
 static void cmd(const char *cmdstr, ...);
-static int getch();
-void getpty(void);
+static void getpty(void);
 static void movea(int x, int y);
 static void mover(int x, int y);
+static void parsecmd(void);
 static void parseesc(void);
 static void scroll(int l);
 static void shell(void);
 static void sigchld(int n);
 static char unbuffer(void);
-static void ungetch(int c);
-
-typedef struct {
-       unsigned char data[BUFSIZ];
-       int s, e;
-       int n;
-} RingBuffer;
-
-typedef struct {
-       unsigned char data[BUFSIZ];
-       int i, n;
-} ReadBuffer;
 
 static int cols = 80, lines = 25;
 static int cx = 0, cy = 0;
@@ -45,7 +56,7 @@ static int ptm, pts;
 static _Bool bold, digit, qmark;
 static pid_t pid;
 static RingBuffer buf;
-static ReadBuffer rbuf;
+static FILE *fptm;
 
 void
 buffer(char c) {
@@ -68,17 +79,6 @@ cmd(const char *cmdstr, ...) {
        va_end(ap);
 }
 
-int
-getch() {
-       if(rbuf.i++ >= rbuf.n) {
-               rbuf.n = read(ptm, rbuf.data, LENGTH(rbuf.data));
-               if(rbuf.n == -1)
-                       err(EXIT_FAILURE, "cannot read from slave pty");
-               rbuf.i = 0;
-       }
-       return rbuf.data[rbuf.i];
-}
-
 void
 movea(int x, int y) {
        x = MAX(x, cols);
@@ -94,15 +94,19 @@ mover(int x, int y) {
 }
 
 void
+parsecmd(void) {
+}
+
+void
 parseesc(void) {
        int i, j;
        int arg[16];
 
        memset(arg, 0, LENGTH(arg));
-       c = getch();
+       c = getc(fptm);
        switch(c) {
        case '[':
-               c = getch();
+               c = getc(fptm);
                for(j = 0; j < LENGTH(arg);) {
                        if(isdigit(c)) {
                                digit = 1;
@@ -124,7 +128,7 @@ parseesc(void) {
                                }
                                break;
                        }
-                       c = getch();
+                       c = getc(fptm);
                }
                switch(c) {
                case '@':
@@ -198,7 +202,7 @@ parseesc(void) {
                break;
        default:
                putchar('\033');
-               ungetch(c);
+               ungetc(c, fptm);
        }
 }
 
@@ -208,6 +212,38 @@ scroll(int l) {
 }
 
 void
+getpty(void) {
+       char *ptsdev;
+
+#if defined(_GNU_SOURCE)
+       ptm = getpt();
+#elif _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600
+       ptm = posix_openpt(O_RDWR);
+#else
+       ptm = open("/dev/ptmx", O_RDWR);
+       if(ptm == -1)
+               if(openpty(&ptm, &pts, NULL, NULL, NULL) == -1)
+                       err(EXIT_FAILURE, "cannot open pty");
+#endif
+#if defined(_XOPEN_SOURCE)
+       if(ptm != -1) {
+               if(grantpt(ptm) == -1)
+                       err(EXIT_FAILURE, "cannot grant access to pty");
+               if(unlockpt(ptm) == -1)
+                       err(EXIT_FAILURE, "cannot unlock pty");
+               ptsdev = ptsname(ptm);
+               if(!ptsdev)
+                       err(EXIT_FAILURE, "slave pty name undefined");
+               pts = open(ptsdev, O_RDWR);
+               if(pts == -1)
+                       err(EXIT_FAILURE, "cannot open slave pty");
+       }
+       else
+               err(EXIT_FAILURE, "cannot open pty");
+#endif
+}
+
+void
 shell(void) {
        static char *shell = NULL;
 
@@ -254,36 +290,41 @@ unbuffer(void) {
        return c;
 }
 
-void
-ungetch(int c) {
-       if(rbuf.i + 1 >= rbuf.n)
-               errx(EXIT_FAILURE, "read buffer full");
-       rbuf.data[rbuf.i++] = c;
-}
-
 int
 main(int argc, char *argv[]) {
        fd_set rfds;
 
-       if(argc == 2 && !strcmp("-v", argv[1])) {
-               fprintf(stderr, "std-"VERSION", © 2008 Matthias-Christian Ott\n");
-               exit(EXIT_SUCCESS);
-       }
-       else if(argc == 1) {
-               fprintf(stderr, "usage: st [-v]\n");
-               exit(EXIT_FAILURE);
-       }
+       if(argc == 2 && !strcmp("-v", argv[1]))
+               errx(EXIT_SUCCESS, "std-"VERSION", © 2008 Matthias-Christian Ott");
+       else if(argc == 1)
+               errx(EXIT_FAILURE, "usage: std [-v]");
        getpty();
        shell();
        FD_ZERO(&rfds);
        FD_SET(STDIN_FILENO, &rfds);
        FD_SET(ptm, &rfds);
+       if(!(fptm = fdopen(ptm, "r+")))
+               err(EXIT_FAILURE, "cannot open pty");
+       if(fcntl(ptm, F_SETFL, O_NONBLOCK) == -1)
+               err(EXIT_FAILURE, "cannot set pty to non-blocking mode");
+       if(fcntl(STDIN_FILENO, F_SETFL, O_NONBLOCK) == -1)
+               err(EXIT_FAILURE, "cannot set stdin to non-blocking mode");
        for(;;) {
-               if(select(ptm + 1, &rfds, NULL, NULL, NULL) == -1)
+               if(select(MAX(ptm, STDIN_FILENO) + 1, &rfds, NULL, NULL, NULL) == -1)
                        err(EXIT_FAILURE, "cannot select");
                if(FD_ISSET(ptm, &rfds)) {
-                       do {
-                               c = getch();
+                       for(;;) {
+                               if((c = getc(fptm)) == EOF) {
+                                       if(feof(fptm)) {
+                                               FD_CLR(ptm, &rfds);
+                                               fflush(fptm);
+                                               break;
+                                       }
+                                       if(errno != EAGAIN)
+                                               err(EXIT_FAILURE, "cannot read from pty");
+                                       fflush(stdout);
+                                       break;
+                               }
                                switch(c) {
                                case '\033':
                                        parseesc();
@@ -291,9 +332,32 @@ main(int argc, char *argv[]) {
                                default:
                                        putchar(c);
                                }
-                       } while(rbuf.i < rbuf.n);
+                       }
                        fflush(stdout);
                }
+               if(FD_ISSET(STDIN_FILENO, &rfds)) {
+                       for(;;) {
+                               if((c = getchar()) == EOF) {
+                                       if(feof(stdin)) {
+                                               FD_CLR(STDIN_FILENO, &rfds);
+                                               fflush(fptm);
+                                               break;
+                                       }
+                                       if(errno != EAGAIN)
+                                               err(EXIT_FAILURE, "cannot read from stdin");
+                                       fflush(fptm);
+                                       break;
+                               }
+                               switch(c) {
+                               case ':':
+                                       parsecmd();
+                                       break;
+                               default:
+                                       putc(c, fptm);
+                               }
+                       }
+                       fflush(fptm);
+               }
        }
        return 0;
 }