X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=std.c;h=ef9e57ac89b0ca7ea06090dbf1194a8fd24de574;hb=082d8bb82bc478bdd0b1470232ba52976a0c035d;hp=daf759e5d4f444999e7c5f522559c7759ba062f0;hpb=f982c1c37ccc4adc38260a132aa64ee29d1a1a8c;p=st.git

diff --git a/std.c b/std.c
index daf759e..ef9e57a 100644
--- a/std.c
+++ b/std.c
@@ -1,9 +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>
@@ -18,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);
@@ -42,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;
@@ -209,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;
 
@@ -265,24 +300,18 @@ ungetch(int c) {
 int
 main(int argc, char *argv[]) {
 	fd_set rfds;
-	int r;
 
-	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);
-	}
+	if(argc == 2 && !strcmp("-v", argv[1]))
+		errx(EXIT_SUCCESS, "std-"VERSION", © 2008 Matthias-Christian Ott");
+	else if(argc == 1)
+		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)
+		if(select(ptm + 1, &rfds, NULL, NULL, NULL) == -1)
 			err(EXIT_FAILURE, "cannot select");
 		if(FD_ISSET(ptm, &rfds)) {
 			do {