add prototype for command parsing

[st.git] / std.c

diff --git a/std.c b/std.c
index 080c490..a9a4f8c 100644 (file)
--- a/std.c
+++ b/std.c
@@ -1,11 +1,12 @@
-#include <sys/ioctl.h>
-#include <sys/select.h>
-#include <sys/stat.h>
+/* See LICENSE file for copyright and license details. */

 #include <sys/types.h>
 #include <sys/wait.h>
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <ctype.h>

-#include <errno.h>
+#include <err.h>

 #include <fcntl.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>
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>


@@ -13,40 +14,44 @@
 #include <string.h>
 #include <unistd.h>
 
 #include <string.h>
 #include <unistd.h>
 

-#define LENGTH(x)      (sizeof (x) / sizeof (x)[0])
+#define LENGTH(x)      (sizeof(x) / sizeof((x)[0]))

 #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))
 

-void buffer(char c);
-void cmd(const char *cmdstr, ...);
-void *emallocz(unsigned int size);
-void eprint(const char *errstr, ...);
-void eprintn(const char *errstr, ...);
-void getpty(void);
-void movea(int x, int y);
-void mover(int x, int y);
-void parse(void);
-void scroll(int l);
-void shell(void);
-void sigchld(int n);
-char unbuffer(void);
-
-enum { QuestionMark = 1, Digit = 2 };
-

 typedef struct {
        unsigned char data[BUFSIZ];
        int s, e;
        int n;
 } RingBuffer;
 
 typedef struct {
        unsigned char data[BUFSIZ];
        int s, e;
        int n;
 } RingBuffer;
 

-int cols = 80, lines = 25;
-int cx = 0, cy = 0;
-int c, s;
-FILE *fptm = NULL;
-int ptm, pts;
-_Bool bold;
-pid_t pid;
-RingBuffer buf;
+typedef struct {
+       unsigned char data[BUFSIZ];
+       int i, n;
+       int fd;
+} ReadBuffer;
+
+static void buffer(char c);
+static void cmd(const char *cmdstr, ...);
+static int getch(ReadBuffer *buf);
+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(ReadBuffer *buf, int c);
+
+static int cols = 80, lines = 25;
+static int cx = 0, cy = 0;
+static int c;
+static int ptm, pts;
+static _Bool bold, digit, qmark;
+static pid_t pid;
+static RingBuffer buf;
+static ReadBuffer cmdbuf, ptmbuf;

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


@@ -69,69 +74,15 @@ cmd(const char *cmdstr, ...) {
        va_end(ap);
 }
 
        va_end(ap);
 }
 

-void *
-emallocz(unsigned int size) {
-       void *res = calloc(1, size);
-
-       if(!res)
-               eprint("fatal: could not malloc() %u bytes\n", size);
-       return res;
-}
-
-void
-eprint(const char *errstr, ...) {
-       va_list ap;
-
-       va_start(ap, errstr);
-       vfprintf(stderr, errstr, ap);
-       va_end(ap);
-       exit(EXIT_FAILURE);
-}
-
-void
-eprintn(const char *errstr, ...) {
-       va_list ap;
-
-       va_start(ap, errstr);
-       vfprintf(stderr, errstr, ap);
-       va_end(ap);
-       fprintf(stderr, ": %s\n", strerror(errno));
-       exit(EXIT_FAILURE);
-}
-
-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)
-                       eprintn("error, cannot open pty");
-               return;
-       }
-#endif
-#if defined(_XOPEN_SOURCE)
-       if(ptm != -1) {
-               if(grantpt(ptm) == -1)
-                       eprintn("error, cannot grant access to pty");
-               if(unlockpt(ptm) == -1)
-                       eprintn("error, cannot unlock pty");
-               ptsdev = ptsname(ptm);
-               if(!ptsdev)
-                       eprintn("error, slave pty name undefined");
-               pts = open(ptsdev, O_RDWR);
-               if(pts == -1)
-                       eprintn("error, cannot open slave pty");
-               puts(ptsdev);
+int
+getch(ReadBuffer *buf) {
+       if(buf->i++ >= buf->n) {
+               buf->n = read(buf->fd, buf->data, BUFSIZ);
+               if(buf->n == -1)
+                       err(EXIT_FAILURE, "cannot read");
+               buf->i = 0;

        }
        }

-       else
-               eprintn("error, cannot open pty");
-#endif
+       return buf->data[buf->i];

 }
 
 void
 }
 
 void


@@ -140,7 +91,7 @@ movea(int x, int y) {
        y = MAX(y, lines);
        cx = x;
        cy = y;
        y = MAX(y, lines);
        cx = x;
        cy = y;

-       cmd("s %d,%d", x, y);
+       cmd("seek(%d,%d)", x, y);

 }
 
 void
 }
 
 void


@@ -148,39 +99,42 @@ 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));

-       s = 0;
-       c = getc(fptm);
+       c = getch(&ptmbuf);

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

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

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

-                               s |= Digit;
+                               digit = 1;

                                arg[j] *= 10;
                                arg[j] += c - '0';
                        }
                        else if(c == '?')
                                arg[j] *= 10;
                                arg[j] += c - '0';
                        }
                        else if(c == '?')

-                               s |= QuestionMark; 
+                               qmark = 1;

                        else if(c == ';') {
                        else if(c == ';') {

-                               if(!(s & Digit))
-                                       eprint("syntax error");
-                               s &= ~Digit;
+                               if(!digit)
+                                       errx(EXIT_FAILURE, "syntax error");
+                               digit = 0;

                                j++;
                        }
                        else {
                                j++;
                        }
                        else {

-                               if(s & Digit) {
-                                       s &= ~Digit;
+                               if(digit) {
+                                       digit = 0;

                                        j++;
                                }
                                break;
                        }
                                        j++;
                                }
                                break;
                        }

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

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


@@ -242,10 +196,10 @@ parseesc(void) {
                                case 0:
                                case 22:
                                        if(bold)
                                case 0:
                                case 22:
                                        if(bold)

-                                               cmd("b");
+                                               cmd("bold");

                                case 1:
                                        if(!bold)
                                case 1:
                                        if(!bold)

-                                               cmd("b");
+                                               cmd("bold");

                                        break;
                                }
                        }
                                        break;
                                }
                        }


@@ -254,13 +208,45 @@ parseesc(void) {
                break;
        default:
                putchar('\033');
                break;
        default:
                putchar('\033');

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

        }
 }
 
 void
 scroll(int l) {
        }
 }
 
 void
 scroll(int l) {

-       cmd("s %d, %d", cx, cy + l);
+       cmd("seek(%d,%d)", cx, cy + 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
 }
 
 void


@@ -272,7 +258,7 @@ shell(void) {
        pid = fork();
        switch(pid) {
        case -1:
        pid = fork();
        switch(pid) {
        case -1:

-               eprint("error, cannot fork\n");
+               err(EXIT_FAILURE, "cannot fork");

        case 0:
                setsid();
                dup2(pts, STDIN_FILENO);
        case 0:
                setsid();
                dup2(pts, STDIN_FILENO);


@@ -293,7 +279,7 @@ sigchld(int n) {
        int ret;
 
        if(waitpid(pid, &ret, 0) == -1)
        int ret;
 
        if(waitpid(pid, &ret, 0) == -1)

-               eprintn("error, waiting for child failed");
+               err(EXIT_FAILURE, "waiting for child failed");

        if(WIFEXITED(ret))
                exit(WEXITSTATUS(ret));
        else
        if(WIFEXITED(ret))
                exit(WEXITSTATUS(ret));
        else


@@ -310,14 +296,55 @@ unbuffer(void) {
        return c;
 }
 
        return c;
 }
 

+void
+ungetch(ReadBuffer *buf, int c) {
+       if(buf->i + 1 >= buf->n)
+               errx(EXIT_FAILURE, "buffer full");
+       buf->data[buf->i++] = c;
+}
+

 int
 main(int argc, char *argv[]) {
 int
 main(int argc, char *argv[]) {

-       fd_set rd;
+       fd_set rfds;
+

        if(argc == 2 && !strcmp("-v", argv[1]))
        if(argc == 2 && !strcmp("-v", argv[1]))

-               eprint("std-"VERSION", © 2008 Matthias-Christian Ott\n");
+               errx(EXIT_SUCCESS, "std-"VERSION", © 2008 Matthias-Christian Ott");

        else if(argc == 1)
        else if(argc == 1)

-               eprint("usage: st [-v]\n");
+               errx(EXIT_FAILURE, "usage: std [-v]");

        getpty();
        shell();
        getpty();
        shell();

+       cmdbuf.fd = STDIN_FILENO;
+       ptmbuf.fd = ptm;
+       FD_ZERO(&rfds);
+       FD_SET(STDIN_FILENO, &rfds);
+       FD_SET(ptm, &rfds);
+       for(;;) {
+               if(select(ptm + 1, &rfds, NULL, NULL, NULL) == -1)
+                       err(EXIT_FAILURE, "cannot select");
+               if(FD_ISSET(STDIN_FILENO, &rfds))
+                       do {
+                               c = getch(&cmdbuf);
+                               switch(c) {
+                               case ':':
+                                       parsecmd();
+                                       break;
+                               default:
+                                       break;
+                               }
+                       } while(cmdbuf.i < cmdbuf.n);
+               if(FD_ISSET(ptm, &rfds)) {
+                       do {
+                               c = getch(&ptmbuf);
+                               switch(c) {
+                               case '\033':
+                                       parseesc();
+                                       break;
+                               default:
+                                       putchar(c);
+                               }
+                       } while(ptmbuf.i < ptmbuf.n);
+                       fflush(stdout);
+               }
+       }

        return 0;
 }
        return 0;
 }