===================================================================
RCS file: /cvs/mandoc/tag.c,v
retrieving revision 1.17
retrieving revision 1.21
diff -u -p -r1.17 -r1.21
--- mandoc/tag.c	2017/01/09 17:49:58	1.17
+++ mandoc/tag.c	2018/11/22 11:30:23	1.21
@@ -1,6 +1,6 @@
-/*	$Id: tag.c,v 1.17 2017/01/09 17:49:58 schwarze Exp $ */
+/*	$Id: tag.c,v 1.21 2018/11/22 11:30:23 schwarze Exp $ */
 /*
- * Copyright (c) 2015, 2016 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2015, 2016, 2018 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -18,6 +18,10 @@
 
 #include <sys/types.h>
 
+#if HAVE_ERR
+#include <err.h>
+#endif
+#include <limits.h>
 #include <signal.h>
 #include <stddef.h>
 #include <stdint.h>
@@ -38,7 +42,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;
@@ -121,41 +125,57 @@ fail:
 
 /*
  * Set the line number where a term is defined,
- * unless it is already defined at a higher priority.
+ * unless it is already defined at a lower priority.
  */
 void
 tag_put(const char *s, int prio, size_t line)
 {
 	struct tag_entry	*entry;
+	const char		*se;
 	size_t			 len;
 	unsigned int		 slot;
 
-	/* Sanity checks. */
-
 	if (tag_files.tfd <= 0)
 		return;
+
 	if (s[0] == '\\' && (s[1] == '&' || s[1] == 'e'))
 		s += 2;
-	if (*s == '\0' || strchr(s, ' ') != NULL)
+
+	/*
+	 * Skip whitespace and whatever follows it,
+	 * and if there is any, downgrade the priority.
+	 */
+
+	len = strcspn(s, " \t");
+	if (len == 0)
 		return;
 
-	slot = ohash_qlookup(&tag_data, s);
+	se = s + len;
+	if (*se != '\0')
+		prio = INT_MAX;
+
+	slot = ohash_qlookupi(&tag_data, s, &se);
 	entry = ohash_find(&tag_data, slot);
 
 	if (entry == NULL) {
 
 		/* Build a new entry. */
 
-		len = strlen(s) + 1;
-		entry = mandoc_malloc(sizeof(*entry) + len);
+		entry = mandoc_malloc(sizeof(*entry) + len + 1);
 		memcpy(entry->s, s, len);
+		entry->s[len] = '\0';
 		entry->lines = NULL;
 		entry->maxlines = entry->nlines = 0;
 		ohash_insert(&tag_data, slot, entry);
 
 	} else {
 
-		/* Handle priority 0 entries. */
+		/*
+		 * Lower priority numbers take precedence,
+		 * but 0 is special.
+		 * A tag with priority 0 is only used
+		 * if the tag occurs exactly once.
+		 */
 
 		if (prio == 0) {
 			if (entry->prio == 0)
@@ -199,6 +219,11 @@ tag_write(void)
 
 	if (tag_files.tfd <= 0)
 		return;
+	if (tag_files.tagname != NULL && ohash_find(&tag_data,
+            ohash_qlookup(&tag_data, tag_files.tagname)) == NULL) {
+		warnx("%s: no such tag", tag_files.tagname);
+		tag_files.tagname = NULL;
+	}
 	stream = fdopen(tag_files.tfd, "w");
 	entry = ohash_first(&tag_data, &slot);
 	while (entry != NULL) {
@@ -213,6 +238,9 @@ tag_write(void)
 	ohash_delete(&tag_data);
 	if (stream != NULL)
 		fclose(stream);
+	else
+		close(tag_files.tfd);
+	tag_files.tfd = -1;
 }
 
 void