correct year of copyright notice

[st.git] / std.c

diff --git a/std.c b/std.c
index 84048e4..ef9e57a 100644 (file)
--- a/std.c
+++ b/std.c
@@ -1,8 +1,12 @@
 /* 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 <fcntl.h>
+#if !(_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600)
+#include <pty.h>
+#endif
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -17,7 +21,7 @@
 static void buffer(char c);
 static void cmd(const char *cmdstr, ...);
 static int getch();
-void getpty(void);
+static void getpty(void);
 static void movea(int x, int y);
 static void mover(int x, int y);
 static void parseesc(void);
@@ -41,7 +45,7 @@ typedef struct {
 static int cols = 80, lines = 25;
 static int cx = 0, cy = 0;
 static int c;
-int ptm, pts;
+static int ptm, pts;
 static _Bool bold, digit, qmark;
 static pid_t pid;
 static RingBuffer buf;
@@ -73,7 +77,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];
@@ -113,7 +117,7 @@ parseesc(void) {
                                qmark = 1;
                        else if(c == ';') {
                                if(!digit)
-                                       eprint("syntax error\n");
+                                       errx(EXIT_FAILURE, "syntax error");
                                digit = 0;
                                j++;
                        }
@@ -208,6 +212,38 @@ scroll(int 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
 shell(void) {
        static char *shell = NULL;
 
@@ -216,7 +252,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 +273,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,28 +293,26 @@ 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;
 }
 
 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");
+               errx(EXIT_SUCCESS, "std-"VERSION", © 2008 Matthias-Christian Ott");
        else if(argc == 1)
-               eprint("usage: st [-v]\n");
+               errx(EXIT_FAILURE, "usage: std [-v]");
        getpty();
        shell();
        FD_ZERO(&rfds);
        FD_SET(STDIN_FILENO, &rfds);
        FD_SET(ptm, &rfds);
        for(;;) {
-               r = select(ptm + 1, &rfds, NULL, NULL, NULL);
-               if(r == -1)
-                       eprintn("error, cannot select");
+               if(select(ptm + 1, &rfds, NULL, NULL, NULL) == -1)
+                       err(EXIT_FAILURE, "cannot select");
                if(FD_ISSET(ptm, &rfds)) {
                        do {
                                c = getch();