Cleanup, no functional change:

[mandoc.git] / tag.c

diff --git a/tag.c b/tag.c
index c517e3abf916045b083cef7911f77a62f604f728..473ea7b6f4913fb3433d3edc77b510fdb801c104 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -1,6 +1,6 @@
-/*     $Id: tag.c,v 1.14 2016/11/08 15:28:17 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,42 +125,72 @@ 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;
 
-       if (tag_files.tfd <= 0 || strchr(s, ' ') != NULL)
+       if (tag_files.tfd <= 0)
+               return;
+
+       if (s[0] == '\\' && (s[1] == '&' || s[1] == 'e'))
+               s += 2;
+
+       /*
+        * 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 {
 
+               /*
+                * 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)
+                               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;
        }
 
@@ -185,10 +219,15 @@ 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) {
-               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 +238,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 +249,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);