From 68618a758d40b09cf2775fe881653310e1f14fdb Mon Sep 17 00:00:00 2001
From: "C. McEnroe" <june@causal.agency>
Date: Fri, 15 Jan 2021 15:06:31 -0500
Subject: Simplyify htagml match output

---
 bin/htagml.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'bin')

diff --git a/bin/htagml.c b/bin/htagml.c
index b95f6a96..f6971de4 100644
--- a/bin/htagml.c
+++ b/bin/htagml.c
@@ -51,7 +51,7 @@ static size_t escape(bool esc, const char *ptr, size_t len) {
 	return len;
 }
 
-static char *hstrstr(char *haystack, char *needle) {
+static char *hstrstr(const char *haystack, const char *needle) {
 	while (haystack) {
 		char *elem = strchr(haystack, '<');
 		char *match = strstr(haystack, needle);
@@ -169,25 +169,25 @@ int main(int argc, char *argv[]) {
 			continue;
 		}
 
-		char *text = tag->tag;
-		char *match = (pipe ? hstrstr(buf, text) : strstr(buf, text));
+		size_t mlen = strlen(tag->tag);
+		char *match = (pipe ? hstrstr : strstr)(buf, tag->tag);
 		if (!match && tag->tag[0] == 'M') {
-			text = "main";
-			match = (pipe ? hstrstr(buf, text) : strstr(buf, text));
+			mlen = 4;
+			match = (pipe ? hstrstr : strstr)(buf, "main");
 		}
-		if (match) escape(!pipe, buf, match - buf);
+		if (!match) {
+			mlen = strlen(buf) - 1;
+			match = buf;
+		}
+		escape(!pipe, buf, match - buf);
 		printf("<a class=\"tag\" id=\"");
 		escape(true, tag->tag, strlen(tag->tag));
 		printf("\" href=\"#");
 		escape(true, tag->tag, strlen(tag->tag));
 		printf("\">");
-		if (match) {
-			match += escape(!pipe, match, strlen(text));
-		} else {
-			escape(!pipe, buf, strlen(buf));
-		}
+		match += escape(!pipe, match, mlen);
 		printf("</a>");
-		if (match) escape(!pipe, match, strlen(match));
+		escape(!pipe, match, strlen(match));
 	}
 	printf(pre ? "</pre>" : index ? "</ul>\n" : "");
 }
-- 
cgit 1.4.1

 value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/src/log/?id=77a4606d6a531ab87a914047df38ebce3a543865&amp;follow=1'>root</a>/<a href='/src/log/bin?id=77a4606d6a531ab87a914047df38ebce3a543865&amp;follow=1'>bin</a>/<a href='/src/log/bin/Makefile?id=77a4606d6a531ab87a914047df38ebce3a543865&amp;follow=1'>Makefile</a> (<a href='/src/log/bin/Makefile?id=77a4606d6a531ab87a914047df38ebce3a543865'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/src/log/bin/Makefile?id=77a4606d6a531ab87a914047df38ebce3a543865&amp;showmsg=1&amp;follow=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-02-06 23:13:47 -0500'>2021-02-06</span></td><td><a href='/src/commit/etc/wsconsctl.conf?id=618a52c502dd8c418c98226bf2d9029bcecc08e7&amp;follow=1'>Enable tapping, reverse scroll, set scaling in wsconsctl</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2021-02-06 23:02:02 -0500'>2021-02-06</span></td><td><a href='/src/commit/home/.xsession?id=f5da4ffc417212c71b5a3ae8ba5cf4de39aa865b&amp;follow=1'>Set root window to black on purple snow</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2021-02-06 22:30:10 -0500'>2021-02-06</span></td><td><a href='/src/commit/home/.xsession?id=d310ac3ddb92c5fe18fc54bcbc66b0e0129f6bec&amp;follow=1'>Add xmodmap configuration</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2021-02-06 20:23:45 -0500'>2021-02-06</span></td><td><a href='/src/commit/home/.xsession?id=1577ad23c4cd5417fbddbec457041823168ddbda&amp;follow=1'>Add initial OpenBSD X configuration</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2021-02-06 19:48:14 -0500'>2021-02-06</span></td><td><a href='/src/commit/bin/scheme.c?id=0de28f7b4c5b1a2e1ece82043987c4f07b78a9ec&amp;follow=1'>Add xterm output to scheme</a></td><td>June McEnroe