remove emallocz()

[st.git] / std.c

diff --git a/std.c b/std.c
index be3f41a..5b430b8 100644 (file)
--- a/std.c
+++ b/std.c
@@ -1,11 +1,8 @@
-#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 <fcntl.h>
+#include <err.h>

 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>


@@ -17,19 +14,18 @@
 #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, ...);
+static void buffer(char c);
+static void cmd(const char *cmdstr, ...);
+static int getch();

 void getpty(void);
 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);
+static void movea(int x, int y);
+static void mover(int x, int y);
+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];
 
 typedef struct {
        unsigned char data[BUFSIZ];


@@ -37,14 +33,19 @@ typedef struct {
        int n;
 } RingBuffer;
 
        int n;
 } RingBuffer;
 

-int cols = 80, lines = 25;
-int cx = 0, cy = 0;
-int c;
-FILE *fptm = NULL;
+typedef struct {
+       unsigned char data[BUFSIZ];
+       int i, n;
+} ReadBuffer;
+
+static int cols = 80, lines = 25;
+static int cx = 0, cy = 0;
+static int c;

 int ptm, pts;
 int ptm, pts;

-_Bool bold, digit, qmark;
-pid_t pid;
-RingBuffer buf;
+static _Bool bold, digit, qmark;
+static pid_t pid;
+static RingBuffer buf;
+static ReadBuffer rbuf;

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


@@ -67,66 +68,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");
-#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");
+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;

        }
        }

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

 }
 
 void
 }
 
 void


@@ -135,7 +85,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


@@ -149,10 +99,10 @@ parseesc(void) {
        int arg[16];
 
        memset(arg, 0, LENGTH(arg));
        int arg[16];
 
        memset(arg, 0, LENGTH(arg));

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

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

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

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


@@ -163,7 +113,7 @@ parseesc(void) {
                                qmark = 1;
                        else if(c == ';') {
                                if(!digit)
                                qmark = 1;
                        else if(c == ';') {
                                if(!digit)

-                                       eprint("syntax error\n");
+                                       errx(EXIT_FAILURE, "syntax error");

                                digit = 0;
                                j++;
                        }
                                digit = 0;
                                j++;
                        }


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

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

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


@@ -236,10 +186,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;
                                }
                        }


@@ -248,13 +198,13 @@ parseesc(void) {
                break;
        default:
                putchar('\033');
                break;
        default:
                putchar('\033');

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

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

-       cmd("s %d, %d", cx, cy + l);
+       cmd("seek(%d,%d)", cx, cy + l);

 }
 
 void
 }
 
 void


@@ -266,7 +216,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);


@@ -287,7 +237,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


@@ -304,25 +254,47 @@ 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[]) {
 int
 main(int argc, char *argv[]) {

-       if(argc == 2 && !strcmp("-v", argv[1]))
-               eprint("std-"VERSION", © 2008 Matthias-Christian Ott\n");
-       else if(argc == 1)
-               eprint("usage: st [-v]\n");
+       fd_set rfds;
+       int r;
+
+       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);
+       }

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

-       fptm = fdopen(ptm, "r+");
-       if(!fptm)
-               eprintn("cannot open slave pty");
+       FD_ZERO(&rfds);
+       FD_SET(STDIN_FILENO, &rfds);
+       FD_SET(ptm, &rfds);

        for(;;) {
        for(;;) {

-               c = getc(fptm);
-               switch(c) {
-               case '\033':
-                       parseesc();
-                       break;
-               default:
-                       putchar(c);
+               r = select(ptm + 1, &rfds, NULL, NULL, NULL);
+               if(r == -1)
+                       err(EXIT_FAILURE, "cannot select");
+               if(FD_ISSET(ptm, &rfds)) {
+                       do {
+                               c = getch();
+                               switch(c) {
+                               case '\033':
+                                       parseesc();
+                                       break;
+                               default:
+                                       putchar(c);
+                               }
+                       } while(rbuf.i < rbuf.n);
+                       fflush(stdout);

                }
        }
        return 0;
                }
        }
        return 0;