X-Git-Url: https://git.cameronkatri.com/mandoc.git/blobdiff_plain/e9803aa7cf0eeb6e692808a1ae7cf7ab263a8e9e..c56c17992552256b55134ead16c3e16164fd2e67:/tag.c?ds=inline

diff --git a/tag.c b/tag.c
index c517e3ab..c0832c4f 100644
--- a/tag.c
+++ b/tag.c
@@ -1,4 +1,4 @@
-/*	$Id: tag.c,v 1.14 2016/11/08 15:28:17 schwarze Exp $ */
+/*	$Id: tag.c,v 1.19 2018/02/23 16:47:10 schwarze Exp $ */
 /*
  * Copyright (c) 2015, 2016 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -38,7 +38,7 @@ struct tag_entry {
 	char	 s[];
 };
 
-static	void	 tag_signal(int) __attribute__((noreturn));
+static	void	 tag_signal(int) __attribute__((__noreturn__));
 
 static struct ohash	 tag_data;
 static struct tag_files	 tag_files;
@@ -130,7 +130,13 @@ tag_put(const char *s, int prio, size_t line)
 	size_t			 len;
 	unsigned int		 slot;
 
-	if (tag_files.tfd <= 0 || strchr(s, ' ') != NULL)
+	/* Sanity checks. */
+
+	if (tag_files.tfd <= 0)
+		return;
+	if (s[0] == '\\' && (s[1] == '&' || s[1] == 'e'))
+		s += 2;
+	if (*s == '\0' || strchr(s, ' ') != NULL)
 		return;
 
 	slot = ohash_qlookup(&tag_data, s);
@@ -149,14 +155,22 @@ tag_put(const char *s, int prio, size_t line)
 
 	} else {
 
+		/* Handle priority 0 entries. */
+
+		if (prio == 0) {
+			if (entry->prio == 0)
+				entry->prio = -1;
+			return;
+		}
+
 		/* A better entry is already present, ignore the new one. */
 
-		if (entry->prio < prio)
+		if (entry->prio > 0 && entry->prio < prio)
 			return;
 
 		/* The existing entry is worse, clear it. */
 
-		if (entry->prio > prio)
+		if (entry->prio < 1 || entry->prio > prio)
 			entry->nlines = 0;
 	}
 
@@ -188,7 +202,7 @@ tag_write(void)
 	stream = fdopen(tag_files.tfd, "w");
 	entry = ohash_first(&tag_data, &slot);
 	while (entry != NULL) {
-		if (stream != NULL)
+		if (stream != NULL && entry->prio >= 0)
 			for (i = 0; i < entry->nlines; i++)
 				fprintf(stream, "%s %s %zu\n",
 				    entry->s, tag_files.ofn, entry->lines[i]);
@@ -199,6 +213,9 @@ tag_write(void)
 	ohash_delete(&tag_data);
 	if (stream != NULL)
 		fclose(stream);
+	else
+		close(tag_files.tfd);
+	tag_files.tfd = -1;
 }
 
 void
@@ -207,11 +224,11 @@ tag_unlink(void)
 	pid_t	 tc_pgid;
 
 	if (tag_files.tcpgid != -1) {
-		tc_pgid = tcgetpgrp(STDIN_FILENO);
+		tc_pgid = tcgetpgrp(tag_files.ofd);
 		if (tc_pgid == tag_files.pager_pid ||
 		    tc_pgid == getpgid(0) ||
 		    getpgid(tc_pgid) == -1)
-			(void)tcsetpgrp(STDIN_FILENO, tag_files.tcpgid);
+			(void)tcsetpgrp(tag_files.ofd, tag_files.tcpgid);
 	}
 	if (*tag_files.ofn != '\0')
 		unlink(tag_files.ofn);