summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--bin/.gitignore1
-rw-r--r--bin/Makefile2
-rw-r--r--bin/README.74
-rw-r--r--bin/hnel.c120
-rw-r--r--bin/man1/hnel.136
5 files changed, 1 insertions, 162 deletions
diff --git a/bin/.gitignore b/bin/.gitignore
index f39282cd..be0a8004 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -13,7 +13,6 @@ fbclock
 freecell
 glitch
 hilex
-hnel
 htagml
 htmltags
 modem
diff --git a/bin/Makefile b/bin/Makefile
index cd7f7c68..14ad94eb 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -14,7 +14,6 @@ BINS += c
 BINS += dtch
 BINS += glitch
 BINS += hilex
-BINS += hnel
 BINS += htagml
 BINS += modem
 BINS += mtags
@@ -54,7 +53,6 @@ LDLIBS.dtch = -lutil
 LDLIBS.fbclock = -lz
 LDLIBS.freecell = -lcurses
 LDLIBS.glitch = -lz
-LDLIBS.hnel = -lutil
 LDLIBS.modem = -lutil
 LDLIBS.pngo = -lz
 LDLIBS.ptee = -lutil
diff --git a/bin/README.7 b/bin/README.7
index c85a6ce0..0ff46eab 100644
--- a/bin/README.7
+++ b/bin/README.7
@@ -1,4 +1,4 @@
-.Dd April 17, 2021
+.Dd April 26, 2021
 .Dt BIN 7
 .Os "Causal Agency"
 .
@@ -40,8 +40,6 @@ patience game
 PNG glitcher
 .It Xr hilex 1
 syntax highlighter
-.It Xr hnel 1
-PTY input remapper
 .It Xr htagml 1
 tags HTMLizer
 .It Xr modem 1
diff --git a/bin/hnel.c b/bin/hnel.c
deleted file mode 100644
index 4fcc42a1..00000000
--- a/bin/hnel.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Copyright (C) 2017  June McEnroe <june@causal.agency>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <err.h>
-#include <poll.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <sys/wait.h>
-#include <sysexits.h>
-#include <termios.h>
-#include <unistd.h>
-
-#if defined __FreeBSD__
-#include <libutil.h>
-#elif defined __linux__
-#include <pty.h>
-#else
-#include <util.h>
-#endif
-
-typedef unsigned char byte;
-
-static struct termios saveTerm;
-static void restoreTerm(void) {
-	tcsetattr(STDIN_FILENO, TCSADRAIN, &saveTerm);
-}
-
-int main(int argc, char *argv[]) {
-	int error;
-
-	if (argc < 4) return EX_USAGE;
-
-	byte table[256] = {0};
-	if (strlen(argv[1]) != strlen(argv[2])) return EX_USAGE;
-	for (const char *from = argv[1], *to = argv[2]; *from; ++from, ++to) {
-		table[(byte)*from] = *to;
-	}
-
-	error = tcgetattr(STDERR_FILENO, &saveTerm);
-	if (error) err(EX_IOERR, "tcgetattr");
-	atexit(restoreTerm);
-
-	struct termios raw = saveTerm;
-	cfmakeraw(&raw);
-	error = tcsetattr(STDERR_FILENO, TCSADRAIN, &raw);
-	if (error) err(EX_IOERR, "tcsetattr");
-
-	struct winsize window;
-	error = ioctl(STDERR_FILENO, TIOCGWINSZ, &window);
-	if (error) err(EX_IOERR, "TIOCGWINSZ");
-
-	int pty;
-	pid_t pid = forkpty(&pty, NULL, NULL, &window);
-	if (pid < 0) err(EX_OSERR, "forkpty");
-
-	if (!pid) {
-		execvp(argv[3], &argv[3]);
-		err(EX_NOINPUT, "%s", argv[3]);
-	}
-
-	bool enable = true;
-
-	byte buf[4096];
-	struct pollfd fds[2] = {
-		{ .fd = STDIN_FILENO, .events = POLLIN },
-		{ .fd = pty, .events = POLLIN },
-	};
-	while (0 < poll(fds, 2, -1)) {
-		if (fds[0].revents & POLLIN) {
-			ssize_t readSize = read(STDIN_FILENO, buf, sizeof(buf));
-			if (readSize < 0) err(EX_IOERR, "read(%d)", STDIN_FILENO);
-
-			if (readSize == 1) {
-				if (buf[0] == CTRL('S')) {
-					enable ^= true;
-					continue;
-				}
-
-				byte c = buf[0];
-				if (enable && table[c]) buf[0] = table[c];
-			}
-
-			ssize_t writeSize = write(pty, buf, readSize);
-			if (writeSize < 0) err(EX_IOERR, "write(%d)", pty);
-			if (writeSize < readSize) errx(EX_IOERR, "short write(%d)", pty);
-		}
-
-		if (fds[1].revents & POLLIN) {
-			ssize_t readSize = read(pty, buf, sizeof(buf));
-			if (readSize < 0) err(EX_IOERR, "read(%d)", pty);
-
-			ssize_t writeSize = write(STDOUT_FILENO, buf, readSize);
-			if (writeSize < 0) err(EX_IOERR, "write(%d)", STDOUT_FILENO);
-			if (writeSize < readSize) {
-				errx(EX_IOERR, "short write(%d)", STDOUT_FILENO);
-			}
-		}
-
-		int status;
-		pid_t dead = waitpid(pid, &status, WNOHANG);
-		if (dead < 0) err(EX_OSERR, "waitpid(%d)", pid);
-		if (dead) return WIFEXITED(status) ? WEXITSTATUS(status) : EX_SOFTWARE;
-	}
-	err(EX_IOERR, "poll");
-}
diff --git a/bin/man1/hnel.1 b/bin/man1/hnel.1
deleted file mode 100644
index 82305be8..00000000
--- a/bin/man1/hnel.1
+++ /dev/null
@@ -1,36 +0,0 @@
-.Dd July 8, 2019
-.Dt HNEL 1
-.Os
-.
-.Sh NAME
-.Nm hnel
-.Nd PTY input remapper
-.
-.Sh SYNOPSIS
-.Nm
-.Ar string1
-.Ar string2
-.Ar command ...
-.
-.Sh DESCRIPTION
-.Nm
-runs the
-.Ar command
-in a new PTY,
-remapping input characters in
-.Ar string1
-to the corresponding characters in
-.Ar string2 .
-Type
-.Ic ^S
-to toggle remapping.
-.
-.Sh EXAMPLES
-.Dl hnel '[]{}' '{}[]' vim
-.
-.Sh SEE ALSO
-.Xr tr 1
-.
-.Sh BUGS
-Window size changes are not propagated
-to the child PTY.