diff options
| -rw-r--r-- | html.c | 23 | ||||
| -rw-r--r-- | main.c | 2 | ||||
| -rw-r--r-- | main.h | 3 | ||||
| -rw-r--r-- | mandocd.c | 4 |
4 files changed, 24 insertions, 8 deletions
@@ -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; @@ -835,6 +835,8 @@ parse(struct curparse *curp, int fd, const char *file) if (curp->outdata == NULL) outdata_alloc(curp); + else if (curp->outtype == OUTT_HTML) + html_reset(curp); mandoc_xr_reset(); meta = mparse_result(curp->mp); @@ -1,7 +1,7 @@ /* $Id$ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> - * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> + * Copyright (c) 2014, 2015, 2019 Ingo Schwarze <schwarze@openbsd.org> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -29,6 +29,7 @@ struct manoutput; void *html_alloc(const struct manoutput *); void html_mdoc(void *, const struct roff_meta *); void html_man(void *, const struct roff_meta *); +void html_reset(void *); void html_free(void *); void tree_mdoc(void *, const struct roff_meta *); @@ -1,7 +1,7 @@ /* $Id$ */ /* * Copyright (c) 2017 Michael Stapelberg <stapelberg@debian.org> - * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org> + * Copyright (c) 2017, 2019 Ingo Schwarze <schwarze@openbsd.org> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -213,6 +213,8 @@ main(int argc, char *argv[]) process(parser, outtype, formatter); mparse_reset(parser); + if (outtype == OUTT_HTML) + html_reset(formatter); fflush(stdout); fflush(stderr); |