From 625662a5c1cbb71cf37653df1f31cd60c48b18ae Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Wed, 22 May 2024 12:16:41 -0400
Subject: Remove use of sysexits.h

---
 bin/ptee.c | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

(limited to 'bin/ptee.c')

diff --git a/bin/ptee.c b/bin/ptee.c
index 52350a21..c4749d62 100644
--- a/bin/ptee.c
+++ b/bin/ptee.c
@@ -24,7 +24,6 @@
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <sys/wait.h>
-#include <sysexits.h>
 #include <termios.h>
 #include <unistd.h>
 
@@ -52,35 +51,35 @@ int main(int argc, char *argv[]) {
 	for (int opt; 0 < (opt = getopt(argc, argv, "t:"));) {
 		switch (opt) {
 			break; case 't': timer = atoi(optarg);
-			break; default:  return EX_USAGE;
+			break; default:  return 1;
 		}
 	}
 	argc -= optind;
 	argv += optind;
 
-	if (argc < 1) return EX_USAGE;
-	if (isatty(STDOUT_FILENO)) errx(EX_USAGE, "stdout is not redirected");
+	if (argc < 1) return 1;
+	if (isatty(STDOUT_FILENO)) errx(1, "stdout is not redirected");
 
 	int error = tcgetattr(STDIN_FILENO, &saveTerm);
-	if (error) err(EX_IOERR, "tcgetattr");
+	if (error) err(1, "tcgetattr");
 	atexit(restoreTerm);
 
 	struct termios raw = saveTerm;
 	cfmakeraw(&raw);
 	error = tcsetattr(STDIN_FILENO, TCSADRAIN, &raw);
-	if (error) err(EX_IOERR, "tcsetattr");
+	if (error) err(1, "tcsetattr");
 
 	struct winsize window;
 	error = ioctl(STDIN_FILENO, TIOCGWINSZ, &window);
-	if (error) err(EX_IOERR, "ioctl");
+	if (error) err(1, "ioctl");
 
 	int pty;
 	pid_t pid = forkpty(&pty, NULL, NULL, &window);
-	if (pid < 0) err(EX_OSERR, "forkpty");
+	if (pid < 0) err(1, "forkpty");
 
 	if (!pid) {
 		execvp(argv[0], argv);
-		err(EX_NOINPUT, "%s", argv[0]);
+		err(1, "%s", argv[0]);
 	}
 
 	if (timer) {
@@ -103,17 +102,17 @@ int main(int argc, char *argv[]) {
 	};
 	for (;;) {
 		int nfds = poll(fds, 2, -1);
-		if (nfds < 0 && errno != EINTR) err(EX_IOERR, "poll");
+		if (nfds < 0 && errno != EINTR) err(1, "poll");
 
 		if (nfds < 0) {
 			ssize_t wlen = write(STDOUT_FILENO, mc, sizeof(mc) - 1);
-			if (wlen < 0) err(EX_IOERR, "write");
+			if (wlen < 0) err(1, "write");
 			continue;
 		}
 
 		if (fds[0].revents & POLLIN) {
 			ssize_t rlen = read(STDIN_FILENO, buf, sizeof(buf));
-			if (rlen < 0) err(EX_IOERR, "read");
+			if (rlen < 0) err(1, "read");
 
 			if (rlen == 1 && buf[0] == CTRL('Q')) {
 				stop ^= true;
@@ -122,30 +121,30 @@ int main(int argc, char *argv[]) {
 
 			if (rlen == 1 && buf[0] == CTRL('S')) {
 				ssize_t wlen = write(STDOUT_FILENO, mc, sizeof(mc) - 1);
-				if (wlen < 0) err(EX_IOERR, "write");
+				if (wlen < 0) err(1, "write");
 				continue;
 			}
 
 			ssize_t wlen = write(pty, buf, rlen);
-			if (wlen < 0) err(EX_IOERR, "write");
+			if (wlen < 0) err(1, "write");
 		}
 
 		if (fds[1].revents & POLLIN) {
 			ssize_t rlen = read(pty, buf, sizeof(buf));
-			if (rlen < 0) err(EX_IOERR, "read");
+			if (rlen < 0) err(1, "read");
 
 			ssize_t wlen = write(STDIN_FILENO, buf, rlen);
-			if (wlen < 0) err(EX_IOERR, "write");
+			if (wlen < 0) err(1, "write");
 
 			if (!stop) {
 				wlen = write(STDOUT_FILENO, buf, rlen);
-				if (wlen < 0) err(EX_IOERR, "write");
+				if (wlen < 0) err(1, "write");
 			}
 		}
 
 		int status;
 		pid_t dead = waitpid(pid, &status, WNOHANG);
-		if (dead < 0) err(EX_OSERR, "waitpid");
-		if (dead) return WIFEXITED(status) ? WEXITSTATUS(status) : EX_SOFTWARE;
+		if (dead < 0) err(1, "waitpid");
+		if (dead) return WIFEXITED(status) ? WEXITSTATUS(status) : 1;
 	}
 }
-- 
cgit 1.4.1