X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=std.c;h=ef9e57ac89b0ca7ea06090dbf1194a8fd24de574;hb=e0d0a2b96e84bba95f6f3e274131e3bbfb3a4f56;hp=5e192458d232481dd3dbc4acb79c68b08c109ce5;hpb=cf147ae9da0221123596b749d4742d06f0ea643b;p=st.git

diff --git a/std.c b/std.c
index 5e19245..ef9e57a 100644
--- 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];
@@ -85,7 +89,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 +117,7 @@ parseesc(void) {
 				qmark = 1;
 			else if(c == ';') {
 				if(!digit)
-					eprint("syntax error\n");
+					errx(EXIT_FAILURE, "syntax error");
 				digit = 0;
 				j++;
 			}
@@ -186,10 +190,10 @@ parseesc(void) {
 				case 0:
 				case 22:
 					if(bold)
-						cmd("b");
+						cmd("bold");
 				case 1:
 					if(!bold)
-						cmd("b");
+						cmd("bold");
 					break;
 				}
 			}
@@ -204,7 +208,39 @@ parseesc(void) {
 
 void
 scroll(int l) {
-	cmd("s %d, %d", cx, cy + l);
+	cmd("seek(%d,%d)", cx, cy + 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
@@ -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,37 +293,37 @@ 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)) {
-			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);
 		}
 	}