From 959b6cc5b728d67b561becc042e8d37cd4f54a9c Mon Sep 17 00:00:00 2001
From: "C. McEnroe" <june@causal.agency>
Date: Tue, 19 Jan 2021 23:33:49 -0500
Subject: Prefer tag matches not preceded by [[:alnum:]]

Otherwise the "id" in "void" matches for "void id".
---
 bin/htagml.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bin/htagml.c b/bin/htagml.c
index 8b7255ab..eb5128d1 100644
--- a/bin/htagml.c
+++ b/bin/htagml.c
@@ -182,6 +182,9 @@ int main(int argc, char *argv[]) {
 
 		size_t mlen = strlen(tag->tag);
 		char *match = (pipe ? hstrstr : strstr)(buf, tag->tag);
+		while (match > buf && isalnum(match[-1])) {
+			match = (pipe ? hstrstr : strstr)(&match[mlen], tag->tag);
+		}
 		if (!match && tag->tag[0] == 'M') {
 			mlen = 4;
 			match = (pipe ? hstrstr : strstr)(buf, "main");
-- 
cgit 1.4.1