source utility functions out to util.c

[st.git] / std.c

diff --git a/std.c b/std.c
index 4808db4..a7b2f4a 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 "util.h"
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -19,13 +16,10 @@
 
 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 parseesc(void);
 void scroll(int l);
 void shell(void);
 void sigchld(int n);
@@ -67,68 +61,6 @@ 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");
-       }
-       else
-               eprintn("error, cannot open pty");
-#endif
-}
-
 void
 movea(int x, int y) {
        x = MAX(x, cols);
@@ -306,12 +238,24 @@ unbuffer(void) {
 
 int
 main(int argc, char *argv[]) {
-       fd_set rd;
        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");
+       for(;;) {
+               c = getc(fptm);
+               switch(c) {
+               case '\033':
+                       parseesc();
+                       break;
+               default:
+                       putchar(c);
+               }
+       }
        return 0;
 }