aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/tag.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2015-07-21 03:26:21 +0000
committerIngo Schwarze <schwarze@openbsd.org>2015-07-21 03:26:21 +0000
commit63715ce7fcf7bb1237ac456e45c0d5ecefda8e2c (patch)
treed6c38fe77d9834bcc97a5cdac755f0dc8a4b923f /tag.c
parentf0143f309111bca83659f897fa5c7c42548890ed (diff)
downloadmandoc-63715ce7fcf7bb1237ac456e45c0d5ecefda8e2c.tar.gz
mandoc-63715ce7fcf7bb1237ac456e45c0d5ecefda8e2c.tar.zst
mandoc-63715ce7fcf7bb1237ac456e45c0d5ecefda8e2c.zip
When creation of the temporary tags file fails, call the pager
without the -T option, because otherwise the pager won't even start. Fixing a bug reported by jca@. While here, shorten the code by two lines and delete one internal interface function.
Diffstat (limited to 'tag.c')
-rw-r--r--tag.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/tag.c b/tag.c
index 69f4e422..fd91e4a4 100644
--- a/tag.c
+++ b/tag.c
@@ -1,4 +1,4 @@
-/* $Id: tag.c,v 1.2 2015/07/18 03:41:37 schwarze Exp $ */
+/* $Id: tag.c,v 1.3 2015/07/21 03:26:22 schwarze Exp $ */
/*
* Copyright (c) 2015 Ingo Schwarze <schwarze@openbsd.org>
*
@@ -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);
}