summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2018-10-08 17:32:13 -0400
committerJune McEnroe <june@causal.agency>2018-10-08 17:32:13 -0400
commit2473e3028e84e99f5ca163b00a8ffc61dc32cdc1 (patch)
tree459a63f5b571a0140ec38e782081b0ff3f52fd24
parentUse col -b to remove formatting for README (diff)
downloadsrc-2473e3028e84e99f5ca163b00a8ffc61dc32cdc1.tar.gz
src-2473e3028e84e99f5ca163b00a8ffc61dc32cdc1.zip
Add ttpre
Diffstat (limited to '')
-rw-r--r--bin/.gitignore1
-rw-r--r--bin/Makefile1
-rw-r--r--bin/README3
-rw-r--r--bin/man/bin.73
-rw-r--r--bin/man/ttpre.132
-rw-r--r--bin/ttpre.c54
6 files changed, 93 insertions, 1 deletions
diff --git a/bin/.gitignore b/bin/.gitignore
index 03b52195..35364af3 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -13,6 +13,7 @@ pbpaste
 pngo
 psf2png
 scheme
+ttpre
 wake
 xx
 watch
diff --git a/bin/Makefile b/bin/Makefile
index f43c7ad7..23643871 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -12,6 +12,7 @@ BINS += pbpaste
 BINS += pngo
 BINS += psf2png
 BINS += scheme
+BINS += ttpre
 BINS += wake
 BINS += xx
 
diff --git a/bin/README b/bin/README
index 552c9ce8..f6ac0046 100644
--- a/bin/README
+++ b/bin/README
@@ -19,8 +19,9 @@ DESCRIPTION
      pngo(1)     PNG optimizer
      psf2png(1)  PSF2 to PNG renderer
      psfed(1)    PSF2 font editor
+     ttpre(1)    man output to HTML
      wake(1)     wake-on-LAN
      watch(1)    watch files
      xx(1)       hexdump
 
-Causal Agency                 September 11, 2018                 Causal Agency
+Causal Agency                 September 28, 2018                 Causal Agency
diff --git a/bin/man/bin.7 b/bin/man/bin.7
index d38e940b..8698c8f8 100644
--- a/bin/man/bin.7
+++ b/bin/man/bin.7
@@ -52,6 +52,9 @@ PSF2 to PNG renderer
 .It Xr psfed 1
 PSF2 font editor
 .
+.It Xr ttpre 1
+man output to HTML
+.
 .It Xr wake 1
 wake-on-LAN
 .
diff --git a/bin/man/ttpre.1 b/bin/man/ttpre.1
new file mode 100644
index 00000000..f772758e
--- /dev/null
+++ b/bin/man/ttpre.1
@@ -0,0 +1,32 @@
+.Dd October 8, 2018
+.Dt TTPRE 1
+.Os "Causal Agency"
+.
+.Sh NAME
+.Nm ttpre
+.Nd man output to HTML
+.
+.Sh SYNOPSIS
+.Nm
+.
+.Sh DESCRIPTION
+.Nm
+formats
+.Xr man 1
+output on standard input
+as an HTML
+.Sy <pre>
+fragment on standard output.
+Ampersands and angle brackets
+are replaced with corresponding HTML entities,
+and backspace formatting sequences
+are replaced with
+.Sy <i>
+and
+.Sy <b>
+tags.
+.
+.Sh SEE ALSO
+.Xr less 1 ,
+.Xr man 1 ,
+.Xr mandoc 1
diff --git a/bin/ttpre.c b/bin/ttpre.c
new file mode 100644
index 00000000..85654d4b
--- /dev/null
+++ b/bin/ttpre.c
@@ -0,0 +1,54 @@
+/* Copyright (C) 2018  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 <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void put(const char *tag, char ch) {
+	if (tag) printf("<%s>", tag);
+	switch (ch) {
+		break; case '&': printf("&amp;");
+		break; case '<': printf("&lt;");
+		break; case '>': printf("&gt;");
+		break; default:  printf("%c", ch);
+	}
+	if (tag) printf("</%s>", tag);
+}
+
+static void push(char ch) {
+	static char q[3];
+	if (q[1] == '\b' && q[0] == '_') {
+		put("i", q[2]);
+		memset(q, 0, 3);
+	} else if (q[1] == '\b' && q[0] == q[2]) {
+		put("b", q[2]);
+		memset(q, 0, 3);
+	} else if (q[0]) {
+		put(NULL, q[0]);
+	}
+	memmove(q, &q[1], 2);
+	q[2] = ch;
+}
+
+int main() {
+	printf("<pre>");
+	char ch;
+	while (EOF != (ch = getchar_unlocked())) push(ch);
+	push('\0'); push('\0'); push('\0');
+	printf("</pre>\n");
+	return EXIT_SUCCESS;
+}
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2018-12-09git: update to v2.20.0Christian Hesse Update to git version v2.20.0. Required changes follow upstream commits: * 00436bf1b1c2a8fe6cf5d2c2457d419d683042f4 (archive: initialize archivers earlier) * 611e42a5980a3a9f8bb3b1b49c1abde63c7a191e (xdiff: provide a separate emit callback for hunks) Signed-off-by: Christian Hesse <mail@eworm.de> 2018-11-25ui-blame: set repo for sbJason A. Donenfeld Otherwise recent git complains and crashes with: "BUG: blame.c:1787: repo is NULL". Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2018-11-25auth-filter: pass url with query string attachedJason A. Donenfeld Otherwise redirections come out wrong. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2018-11-21git: use xz compressed archive for downloadChristian Hesse Upstream will stop providing gz compressed source tarballs [0], so stop using them. [0] https://lists.zx2c4.com/pipermail/cgit/2018-November/004254.html Signed-off-by: Christian Hesse <mail@eworm.de> 2018-10-12git: update to v2.19.1Christian Hesse Update to git version v2.19.1. Required changes follow upstream commits: * commit: add repository argument to get_cached_commit_buffer (3ce85f7e5a41116145179f0fae2ce6d86558d099) * commit: add repository argument to lookup_commit_reference (2122f6754c93be8f02bfb5704ed96c88fc9837a8) * object: add repository argument to parse_object (109cd76dd3467bd05f8d2145b857006649741d5c) * tag: add repository argument to deref_tag (a74093da5ed601a09fa158e5ba6f6f14c1142a3e) * tag: add repository argument to lookup_tag (ce71efb713f97f476a2d2ab541a0c73f684a5db3) * tree: add repository argument to lookup_tree (f86bcc7b2ce6cad68ba1a48a528e380c6126705e) * archive.c: avoid access to the_index (b612ee202a48f129f81f8f6a5af6cf71d1a9caef) * for_each_*_object: move declarations to object-store.h (0889aae1cd18c1804ba01c1a4229e516dfb9fe9b) Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-ssdiff: ban strcat()Christian Hesse Git upstream bans strcat() with commit: banned.h: mark strcat() as banned 1b11b64b815db62f93a04242e4aed5687a448748 Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-ssdiff: ban strncpy()Christian Hesse Git upstream bans strncpy() with commit: banned.h: mark strncpy() as banned e488b7aba743d23b830d239dcc33d9ca0745a9ad Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-shared: ban strcat()Christian Hesse Git upstream bans strcat() with commit: banned.h: mark strcat() as banned 1b11b64b815db62f93a04242e4aed5687a448748 To avoid compiler warnings from gcc 8.1.x we get the hard way. Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-patch: ban sprintf()Christian Hesse Git upstream bans sprintf() with commit: banned.h: mark sprintf() as banned cc8fdaee1eeaf05d8dd55ff11f111b815f673c58 Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-log: ban strncpy()Christian Hesse Git upstream bans strncpy() with commit: banned.h: mark strncpy() as banned e488b7aba743d23b830d239dcc33d9ca0745a9ad Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-log: ban strcpy()Christian Hesse Git upstream bans strcpy() with commit: automatically ban strcpy() c8af66ab8ad7cd78557f0f9f5ef6a52fd46ee6dd Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11parsing: ban sprintf()Christian Hesse Git upstream bans sprintf() with commit: banned.h: mark sprintf() as banned cc8fdaee1eeaf05d8dd55ff11f111b815f673c58 Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11parsing: ban strncpy()Christian Hesse Git upstream bans strncpy() with commit: banned.h: mark strncpy() as banned e488b7aba743d23b830d239dcc33d9ca0745a9ad Signed-off-by: Christian Hesse <mail@eworm.de> 2018-08-28filters: generate anchor links from markdownChristian Hesse This makes the markdown filter generate anchor links for headings. Signed-off-by: Christian Hesse <mail@eworm.de> Tested-by: jean-christophe manciot <actionmystique@gmail.com> 2018-08-03Bump version.Jason A. Donenfeld Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2018-08-03clone: fix directory traversalJason A. Donenfeld This was introduced in the initial version of this code, way back when in 2008. $ curl http://127.0.0.1/cgit/repo/objects/?path=../../../../../../../../../etc/passwd root:x:0:0:root:/root:/bin/sh ... Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Reported-by: Jann Horn <jannh@google.com> 2018-08-03config: record repo.snapshot-prefix in the per-repo configKonstantin Ryabitsev