remove emallocz()

[st.git] / std.c

diff --git a/std.c b/std.c
index fbabaa4..5b430b8 100644 (file)
--- a/std.c
+++ b/std.c
@@ -1,8 +1,8 @@
 /* See LICENSE file for copyright and license details. */
-#include "util.h"
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <ctype.h>
+#include <err.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -14,18 +14,18 @@
 #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, ...);
-int getch();
+static void buffer(char c);
+static void cmd(const char *cmdstr, ...);
+static int getch();
 void getpty(void);
-void movea(int x, int y);
-void mover(int x, int y);
-void parseesc(void);
-void scroll(int l);
-void shell(void);
-void sigchld(int n);
-char unbuffer(void);
-void ungetch(int c);
+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];
@@ -38,14 +38,14 @@ typedef struct {
        int i, n;
 } ReadBuffer;
 
-int cols = 80, lines = 25;
-int cx = 0, cy = 0;
-int c;
+static int cols = 80, lines = 25;
+static int cx = 0, cy = 0;
+static int c;
 int ptm, pts;
-_Bool bold, digit, qmark;
-pid_t pid;
-RingBuffer buf;
-ReadBuffer rbuf;
+static _Bool bold, digit, qmark;
+static pid_t pid;
+static RingBuffer buf;
+static ReadBuffer rbuf;
 
 void
 buffer(char c) {
@@ -73,7 +73,7 @@ getch() {
        if(rbuf.i++ >= rbuf.n) {
                rbuf.n = read(ptm, rbuf.data, LENGTH(rbuf.data));
                if(rbuf.n == -1)
-                       eprintn("error, cannot read from slave pty");
+                       err(EXIT_FAILURE, "cannot read from slave pty");
                rbuf.i = 0;
        }
        return rbuf.data[rbuf.i];
@@ -85,7 +85,7 @@ movea(int x, int y) {
        y = MAX(y, lines);
        cx = x;
        cy = y;
-       cmd("s %d,%d", x, y);
+       cmd("seek(%d,%d)", x, y);
 }
 
 void
@@ -113,7 +113,7 @@ parseesc(void) {
                                qmark = 1;
                        else if(c == ';') {
                                if(!digit)
-                                       eprint("syntax error\n");
+                                       errx(EXIT_FAILURE, "syntax error");
                                digit = 0;
                                j++;
                        }
@@ -186,10 +186,10 @@ parseesc(void) {
                                case 0:
                                case 22:
                                        if(bold)
-                                               cmd("b");
+                                               cmd("bold");
                                case 1:
                                        if(!bold)
-                                               cmd("b");
+                                               cmd("bold");
                                        break;
                                }
                        }
@@ -204,7 +204,7 @@ parseesc(void) {
 
 void
 scroll(int l) {
-       cmd("s %d, %d", cx, cy + l);
+       cmd("seek(%d,%d)", cx, cy + l);
 }
 
 void
@@ -216,7 +216,7 @@ shell(void) {
        pid = fork();
        switch(pid) {
        case -1:
-               eprint("error, cannot fork\n");
+               err(EXIT_FAILURE, "cannot fork");
        case 0:
                setsid();
                dup2(pts, STDIN_FILENO);
@@ -237,7 +237,7 @@ sigchld(int n) {
        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
@@ -257,7 +257,7 @@ unbuffer(void) {
 void
 ungetch(int c) {
        if(rbuf.i + 1 >= rbuf.n)
-               eprint("error, read buffer full\n");
+               errx(EXIT_FAILURE, "read buffer full");
        rbuf.data[rbuf.i++] = c;
 }
 
@@ -266,10 +266,14 @@ main(int argc, char *argv[]) {
        fd_set rfds;
        int r;
 
-       if(argc == 2 && !strcmp("-v", argv[1]))
-               eprint("std-"VERSION", © 2008 Matthias-Christian Ott\n");
-       else if(argc == 1)
-               eprint("usage: st [-v]\n");
+       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();
        FD_ZERO(&rfds);
@@ -278,16 +282,18 @@ main(int argc, char *argv[]) {
        for(;;) {
                r = select(ptm + 1, &rfds, NULL, NULL, NULL);
                if(r == -1)
-                       eprintn("error, cannot select");
+                       err(EXIT_FAILURE, "cannot select");
                if(FD_ISSET(ptm, &rfds)) {
-                       c = getch();
-                       switch(c) {
-                       case '\033':
-                               parseesc();
-                               break;
-                       default:
-                               putchar(c);
-                       }
+                       do {
+                               c = getch();
+                               switch(c) {
+                               case '\033':
+                                       parseesc();
+                                       break;
+                               default:
+                                       putchar(c);
+                               }
+                       } while(rbuf.i < rbuf.n);
                        fflush(stdout);
                }
        }