do not break the line between Bsx/Bx/Fx/Nx/Ox/Dx and its arguments

[mandoc.git] / tag.c

diff --git a/tag.c b/tag.c
index fd9f2a1137c90a08789f0f7dc0636e2729924554..21ac6b32e4d3a49ae6c177969178f29d2375d475 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -1,4 +1,4 @@
-/*     $Id: tag.c,v 1.15 2016/11/08 15:57:28 schwarze Exp $ */
+/*     $Id: tag.c,v 1.18 2017/02/17 14:31:52 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;
@@ -155,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;
        }
 
@@ -194,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]);
@@ -213,11 +221,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);