=================================================================== RCS file: /cvs/mandoc/read.c,v retrieving revision 1.215 retrieving revision 1.219 diff -u -p -r1.215 -r1.219 --- mandoc/read.c 2020/03/13 15:32:28 1.215 +++ mandoc/read.c 2020/04/24 12:02:33 1.219 @@ -1,6 +1,6 @@ -/* $Id: read.c,v 1.215 2020/03/13 15:32:28 schwarze Exp $ */ +/* $Id: read.c,v 1.219 2020/04/24 12:02:33 schwarze Exp $ */ /* - * Copyright (c) 2010-2019 Ingo Schwarze + * Copyright (c) 2010-2020 Ingo Schwarze * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010, 2012 Joerg Sonnenberger * @@ -42,12 +42,12 @@ #include "mandoc_aux.h" #include "mandoc.h" #include "roff.h" -#include "tag.h" #include "mdoc.h" #include "man.h" #include "mandoc_parse.h" #include "libmandoc.h" #include "roff_int.h" +#include "tag.h" #define REPARSE_LIMIT 1000 @@ -554,7 +554,7 @@ mparse_readfd(struct mparse *curp, int fd, const char struct buf blk; struct buf *save_primary; - const char *save_filename; + const char *save_filename, *cp; size_t offset; int save_filenc, save_lineno; int with_mmap; @@ -562,7 +562,13 @@ mparse_readfd(struct mparse *curp, int fd, const char if (recursion_depth > 64) { mandoc_msg(MANDOCERR_ROFFLOOP, curp->line, 0, NULL); return; - } + } else if (recursion_depth == 0 && + (cp = strrchr(filename, '.')) != NULL && + cp[1] >= '1' && cp[1] <= '9') + curp->man->filesec = cp[1]; + else + curp->man->filesec = '\0'; + if (read_whole_file(curp, fd, &blk, &with_mmap) == -1) return; @@ -678,11 +684,13 @@ mparse_alloc(int options, enum mandoc_os os_e, const c void mparse_reset(struct mparse *curp) { + tag_free(); roff_reset(curp->roff); roff_man_reset(curp->man); free_buf_list(curp->secondary); curp->secondary = NULL; curp->gzip = 0; + tag_alloc(); } void @@ -706,6 +714,7 @@ mparse_result(struct mparse *curp) mdoc_validate(curp->man); else man_validate(curp->man); + tag_postprocess(curp->man, curp->man->meta.first); } return &curp->man->meta; }