===================================================================
RCS file: /cvs/mandoc/tag.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mandoc/tag.c	2015/07/17 22:38:29	1.1
+++ mandoc/tag.c	2015/07/18 03:41:37	1.2
@@ -1,4 +1,4 @@
-/*      $Id: tag.c,v 1.1 2015/07/17 22:38:29 schwarze Exp $    */
+/*      $Id: tag.c,v 1.2 2015/07/18 03:41:37 schwarze Exp $    */
 /*
  * Copyright (c) 2015 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -16,6 +16,7 @@
  */
 #include <sys/types.h>
 
+#include <signal.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -36,6 +37,7 @@ struct tag_entry {
 	char	 s[];
 };
 
+static	void	 tag_signal(int);
 static	void	*tag_alloc(size_t, void *);
 static	void	 tag_free(void *, void *);
 static	void	*tag_calloc(size_t, size_t, void *);
@@ -56,6 +58,9 @@ tag_init(void)
 	struct ohash_info	 tag_info;
 
 	tag_fn = mandoc_strdup("/tmp/man.XXXXXXXXXX");
+	signal(SIGHUP, tag_signal);
+	signal(SIGINT, tag_signal);
+	signal(SIGTERM, tag_signal);
 	if ((tag_fd = mkstemp(tag_fn)) == -1) {
 		free(tag_fn);
 		tag_fn = NULL;
@@ -156,6 +161,17 @@ tag_unlink(void)
 
 	if (tag_fn != NULL)
 		unlink(tag_fn);
+}
+
+static void
+tag_signal(int signum)
+{
+
+	tag_unlink();
+	signal(signum, SIG_DFL);
+	kill(getpid(), signum);
+	/* NOTREACHED */
+	_exit(1);
 }
 
 /*