make local functions and variables static

[st.git] / std.c

diff --git a/std.c b/std.c
index 4c28ae4..5e19245 100644 (file)
--- a/std.c
+++ b/std.c
@@ -1,14 +1,8 @@
-#include <sys/ioctl.h>
-#include <sys/select.h>
-#include <sys/stat.h>
+/* See LICENSE file for copyright and license details. */
+#include "util.h"
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <ctype.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>
@@ -20,19 +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, ...);
-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 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];
@@ -40,14 +33,19 @@ typedef struct {
        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;
-_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) {
@@ -70,66 +68,15 @@ cmd(const char *cmdstr, ...) {
        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)
+                       eprintn("error, cannot read from slave pty");
+               rbuf.i = 0;
        }
-       else
-               eprintn("error, cannot open pty");
-#endif
+       return rbuf.data[rbuf.i];
 }
 
 void
@@ -152,10 +99,10 @@ parseesc(void) {
        int arg[16];
 
        memset(arg, 0, LENGTH(arg));
-       c = getc(fptm);
+       c = getch();
        switch(c) {
        case '[':
-               c = getc(fptm);
+               c = getch();
                for(j = 0; j < LENGTH(arg);) {
                        if(isdigit(c)) {
                                digit = 1;
@@ -177,7 +124,7 @@ parseesc(void) {
                                }
                                break;
                        }
-                       c = getc(fptm);
+                       c = getch();
                }
                switch(c) {
                case '@':
@@ -251,7 +198,7 @@ parseesc(void) {
                break;
        default:
                putchar('\033');
-               ungetc(c, fptm);
+               ungetch(c);
        }
 }
 
@@ -307,25 +254,41 @@ unbuffer(void) {
        return c;
 }
 
+void
+ungetch(int c) {
+       if(rbuf.i + 1 >= rbuf.n)
+               eprint("error, read buffer full\n");
+       rbuf.data[rbuf.i++] = c;
+}
+
 int
 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");
        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(;;) {
-               c = getc(fptm);
-               switch(c) {
-               case '\033':
-                       parseesc();
-                       break;
-               default:
-                       putchar(c);
+               r = select(ptm + 1, &rfds, NULL, NULL, NULL);
+               if(r == -1)
+                       eprintn("error, cannot select");
+               if(FD_ISSET(ptm, &rfds)) {
+                       c = getch();
+                       switch(c) {
+                       case '\033':
+                               parseesc();
+                               break;
+                       default:
+                               putchar(c);
+                       }
+                       fflush(stdout);
                }
        }
        return 0;