diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2019-03-03 13:02:11 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2019-03-03 13:02:11 +0000 |
commit | f4f4629c2afc1c20003c12753c35528bd807708a (patch) | |
tree | 6997e819a3f1fcf467b4f433a29078d073df1fd7 /html.c | |
parent | fcbf62db4a9cb9f6fe8df047ee6ee41fee8dab76 (diff) | |
download | mandoc-f4f4629c2afc1c20003c12753c35528bd807708a.tar.gz mandoc-f4f4629c2afc1c20003c12753c35528bd807708a.tar.zst mandoc-f4f4629c2afc1c20003c12753c35528bd807708a.zip |
Reset HTML formatter state, in particular the id_unique hash,
after processing each manual page, such that the next page
starts from a clean state and doesn't continue suffix numbering.
Issue found while looking at https://github.com/Debian/debiman/issues/48
which was brought up by Orestis Ioannou <oorestisime at github>.
Diffstat (limited to 'html.c')
-rw-r--r-- | html.c | 25 |
1 files changed, 18 insertions, 7 deletions
@@ -1,4 +1,4 @@ -/* $Id: html.c,v 1.253 2019/03/01 10:57:17 schwarze Exp $ */ +/* $Id: html.c,v 1.254 2019/03/03 13:02:11 schwarze Exp $ */ /* * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011-2015, 2017-2019 Ingo Schwarze <schwarze@openbsd.org> @@ -110,6 +110,7 @@ static const struct htmldata htmltags[TAG_MAX] = { /* Avoid duplicate HTML id= attributes. */ static struct ohash id_unique; +static void html_reset_internal(struct html *); static void print_byte(struct html *, char); static void print_endword(struct html *); static void print_indent(struct html *); @@ -145,21 +146,17 @@ html_alloc(const struct manoutput *outopts) return h; } -void -html_free(void *p) +static void +html_reset_internal(struct html *h) { struct tag *tag; - struct html *h; char *cp; unsigned int slot; - h = (struct html *)p; while ((tag = h->tag) != NULL) { h->tag = tag->next; free(tag); } - free(h); - cp = ohash_first(&id_unique, &slot); while (cp != NULL) { free(cp); @@ -169,6 +166,20 @@ html_free(void *p) } void +html_reset(void *p) +{ + html_reset_internal(p); + mandoc_ohash_init(&id_unique, 4, 0); +} + +void +html_free(void *p) +{ + html_reset_internal(p); + free(p); +} + +void print_gen_head(struct html *h) { struct tag *t; |