add accidentally omitted word

[st.git] / std.c

diff --git a/std.c b/std.c
index ef9e57a..55da9d6 100644 (file)
--- a/std.c
+++ b/std.c
@@ -1,8 +1,21 @@
-/* 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 <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>
 #include <fcntl.h>
 #if !(_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600)
 #include <pty.h>


@@ -18,29 +31,23 @@
 #define MAX(a,b)       (((a) > (b)) ? (a) : (b))
 #define MIN(a,b)       (((a) < (b)) ? (a) : (b))
 
 #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 void buffer(char c);
 static void cmd(const char *cmdstr, ...);

-static int getch();

 static void getpty(void);
 static void movea(int x, int y);
 static void mover(int x, int y);
 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 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;
 
 static int cols = 80, lines = 25;
 static int cx = 0, cy = 0;


@@ -49,7 +56,7 @@ static int ptm, pts;
 static _Bool bold, digit, qmark;
 static pid_t pid;
 static RingBuffer buf;
 static _Bool bold, digit, qmark;
 static pid_t pid;
 static RingBuffer buf;

-static ReadBuffer rbuf;
+static FILE *fptm;

 
 void
 buffer(char c) {
 
 void
 buffer(char c) {


@@ -72,17 +79,6 @@ cmd(const char *cmdstr, ...) {
        va_end(ap);
 }
 
        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);
 void
 movea(int x, int y) {
        x = MAX(x, cols);


@@ -97,16 +93,20 @@ mover(int x, int y) {
        movea(cx + x, cy + y);
 }
 
        movea(cx + x, cy + y);
 }
 

+void
+parsecmd(void) {
+}
+

 void
 parseesc(void) {
        int i, j;
        int arg[16];
 
        memset(arg, 0, LENGTH(arg));
 void
 parseesc(void) {
        int i, j;
        int arg[16];
 
        memset(arg, 0, LENGTH(arg));

-       c = getch();
+       c = getc(fptm);

        switch(c) {
        case '[':
        switch(c) {
        case '[':

-               c = getch();
+               c = getc(fptm);

                for(j = 0; j < LENGTH(arg);) {
                        if(isdigit(c)) {
                                digit = 1;
                for(j = 0; j < LENGTH(arg);) {
                        if(isdigit(c)) {
                                digit = 1;


@@ -128,7 +128,7 @@ parseesc(void) {
                                }
                                break;
                        }
                                }
                                break;
                        }

-                       c = getch();
+                       c = getc(fptm);

                }
                switch(c) {
                case '@':
                }
                switch(c) {
                case '@':


@@ -202,7 +202,7 @@ parseesc(void) {
                break;
        default:
                putchar('\033');
                break;
        default:
                putchar('\033');

-               ungetch(c);
+               ungetc(c, fptm);

        }
 }
 
        }
 }
 


@@ -290,13 +290,6 @@ unbuffer(void) {
        return c;
 }
 
        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;
 int
 main(int argc, char *argv[]) {
        fd_set rfds;


@@ -310,12 +303,28 @@ main(int argc, char *argv[]) {
        FD_ZERO(&rfds);
        FD_SET(STDIN_FILENO, &rfds);
        FD_SET(ptm, &rfds);
        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(;;) {
        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)) {
                        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();
                                switch(c) {
                                case '\033':
                                        parseesc();


@@ -323,9 +332,32 @@ main(int argc, char *argv[]) {
                                default:
                                        putchar(c);
                                }
                                default:
                                        putchar(c);
                                }

-                       } while(rbuf.i < rbuf.n);
+                       }

                        fflush(stdout);
                }
                        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;
 }
        }
        return 0;
 }