Support nesting of elements with next-line scope.

[mandoc.git] / tag.c

diff --git a/tag.c b/tag.c
index a618c4a01cf9ae0f0be0df6c66a6ce3a512290b5..c0832c4f74b7b011805c4ae2050bc6e9d090210d 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -1,4 +1,4 @@
-/*     $Id: tag.c,v 1.16 2016/11/08 16:23:58 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;
@@ -213,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
@@ -221,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);