3 files changed, 14 insertions, 18 deletions

diff --git a/main.c b/main.c
index a6587683..22707176 100644
--- a/main.c
+++ b/main.c
@@ -993,15 +993,18 @@ spawn_pager(void)
 
 	/* Read all text right away and use the tag file. */
 
-	if ((cmdlen = strlen(argv[0])) >= 4) {
+	for (;;) {
+		if ((cmdlen = strlen(argv[0])) < 4)
+			break;
 		cp = argv[0] + cmdlen - 4;
-		if (strcmp(cp, "less") == 0 ||
-		    strcmp(cp, "more") == 0) {
-			tag_init();
-			argv[argc++] = mandoc_strdup("+G1G");
-			argv[argc++] = mandoc_strdup("-T");
-			argv[argc++] = tag_filename();
-		}
+		if (strcmp(cp, "less") && strcmp(cp, "more"))
+			break;
+		if ((cp = tag_init()) == NULL)
+			break;
+		argv[argc++] = mandoc_strdup("+G1G");
+		argv[argc++] = mandoc_strdup("-T");
+		argv[argc++] = cp;
+		break;
 	}
 	argv[argc] = NULL;
 
diff --git a/tag.c b/tag.c
index 41cb2183..b2326bb6 100644
--- a/tag.c
+++ b/tag.c
@@ -52,7 +52,7 @@ static int		 tag_fd = -1;
  * where various marked-up terms are documented and create
  * the temporary tags file, saving the name for the pager.
  */
-void
+char *
 tag_init(void)
 {
 	struct ohash_info	 tag_info;
@@ -64,7 +64,7 @@ tag_init(void)
 	if ((tag_fd = mkstemp(tag_fn)) == -1) {
 		free(tag_fn);
 		tag_fn = NULL;
-		return;
+		return(NULL);
 	}
 
 	tag_info.alloc = tag_alloc;
@@ -73,12 +73,6 @@ tag_init(void)
 	tag_info.key_offset = offsetof(struct tag_entry, s);
 	tag_info.data = NULL;
 	ohash_init(&tag_data, 4, &tag_info);
-}
-
-char *
-tag_filename(void)
-{
-
 	return(tag_fn);
 }
 
diff --git a/tag.h b/tag.h
index 18f7b804..654695d2 100644
--- a/tag.h
+++ b/tag.h
@@ -17,8 +17,7 @@
 
 __BEGIN_DECLS
 
-void	 tag_init(void);
-char	*tag_filename(void);
+char	*tag_init(void);
 size_t	 tag_get(const char *, size_t);
 void	 tag_put(const char *, size_t, size_t);
 void	 tag_write(void);