=================================================================== RCS file: /cvs/mandoc/man.c,v retrieving revision 1.59 retrieving revision 1.178 diff -u -p -r1.59 -r1.178 --- mandoc/man.c 2010/03/29 10:10:35 1.59 +++ mandoc/man.c 2018/08/23 19:33:27 1.178 @@ -1,22 +1,22 @@ -/* $Id: man.c,v 1.59 2010/03/29 10:10:35 kristaps Exp $ */ +/* $Id: man.c,v 1.178 2018/08/23 19:33:27 schwarze Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons + * Copyright (c) 2013,2014,2015,2017,2018 Ingo Schwarze + * Copyright (c) 2011 Joerg Sonnenberger * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include @@ -27,710 +27,349 @@ #include #include -#include "libman.h" +#include "mandoc_aux.h" +#include "mandoc.h" +#include "roff.h" +#include "man.h" #include "libmandoc.h" +#include "roff_int.h" +#include "libman.h" -const char *const __man_merrnames[WERRMAX] = { - "invalid character", /* WNPRINT */ - "invalid manual section", /* WMSEC */ - "invalid date format", /* WDATE */ - "scope of prior line violated", /* WLNSCOPE */ - "over-zealous prior line scope violation", /* WLNSCOPE2 */ - "trailing whitespace", /* WTSPACE */ - "unterminated quoted parameter", /* WTQUOTE */ - "document has no body", /* WNODATA */ - "document has no title/section", /* WNOTITLE */ - "invalid escape sequence", /* WESCAPE */ - "invalid number format", /* WNUMFMT */ - "expected block head arguments", /* WHEADARGS */ - "expected block body arguments", /* WBODYARGS */ - "expected empty block head", /* WNHEADARGS */ - "ill-formed macro", /* WMACROFORM */ - "scope open on exit", /* WEXITSCOPE */ - "no scope context", /* WNOSCOPE */ - "literal context already open", /* WOLITERAL */ - "no literal context open", /* WNLITERAL */ - "invalid nesting of roff declarations", /* WROFFNEST */ - "scope in roff instructions broken", /* WROFFSCOPE */ - "document title should be uppercase", /* WTITLECASE */ -}; +static void man_descope(struct roff_man *, int, int); +static int man_ptext(struct roff_man *, int, char *, int); +static int man_pmacro(struct roff_man *, int, char *, int); -const char *const __man_macronames[MAN_MAX] = { - "br", "TH", "SH", "SS", - "TP", "LP", "PP", "P", - "IP", "HP", "SM", "SB", - "BI", "IB", "BR", "RB", - "R", "B", "I", "IR", - "RI", "na", "i", "sp", - "nf", "fi", "r", "RE", - "RS", "DT", "UC", "PD", - "Sp", "Vb", "Ve", "de", - "dei", "am", "ami", "ig", - ".", - }; -const char * const *man_macronames = __man_macronames; - -static struct man_node *man_node_alloc(int, int, - enum man_type, enum mant); -static int man_node_append(struct man *, - struct man_node *); -static void man_node_free(struct man_node *); -static void man_node_unlink(struct man *, - struct man_node *); -static int man_ptext(struct man *, int, char *); -static int man_pmacro(struct man *, int, char *); -static void man_free1(struct man *); -static void man_alloc1(struct man *); -static int pstring(struct man *, int, int, - const char *, size_t); -static int macrowarn(struct man *, int, const char *); - - -const struct man_node * -man_node(const struct man *m) +int +man_parseln(struct roff_man *man, int ln, char *buf, int offs) { - return(MAN_HALT & m->flags ? NULL : m->first); -} + if (man->last->type != ROFFT_EQN || ln > man->last->line) + man->flags |= MAN_NEWLINE; - -const struct man_meta * -man_meta(const struct man *m) -{ - - return(MAN_HALT & m->flags ? NULL : &m->meta); + return roff_getcontrol(man->roff, buf, &offs) ? + man_pmacro(man, ln, buf, offs) : + man_ptext(man, ln, buf, offs); } - -void -man_reset(struct man *man) +static void +man_descope(struct roff_man *man, int line, int offs) { + /* + * Co-ordinate what happens with having a next-line scope open: + * first close out the element scope (if applicable), then close + * out the block scope (also if applicable). + */ - man_free1(man); - man_alloc1(man); + if (man->flags & MAN_ELINE) { + man->flags &= ~MAN_ELINE; + man_unscope(man, man->last->parent); + } + if ( ! (man->flags & MAN_BLINE)) + return; + man->flags &= ~MAN_BLINE; + man_unscope(man, man->last->parent); + roff_body_alloc(man, line, offs, man->last->tok); } - -void -man_free(struct man *man) +static int +man_ptext(struct roff_man *man, int line, char *buf, int offs) { + int i; + const char *cp, *sp; + char *ep; - man_free1(man); - free(man); -} + /* Literal free-form text whitespace is preserved. */ + if (man->flags & MAN_LITERAL) { + roff_word_alloc(man, line, offs, buf + offs); + man_descope(man, line, offs); + return 1; + } -struct man * -man_alloc(void *data, int pflags, const struct man_cb *cb) -{ - struct man *p; + for (i = offs; buf[i] == ' '; i++) + /* Skip leading whitespace. */ ; - p = mandoc_calloc(1, sizeof(struct man)); + /* + * Blank lines are ignored in next line scope + * and right after headings and cancel preceding \c, + * but add a single vertical space elsewhere. + */ - if (cb) - memcpy(&p->cb, cb, sizeof(struct man_cb)); + if (buf[i] == '\0') { + if (man->flags & (MAN_ELINE | MAN_BLINE)) { + mandoc_msg(MANDOCERR_BLK_BLANK, man->parse, + line, 0, NULL); + return 1; + } + if (man->last->tok == MAN_SH || man->last->tok == MAN_SS) + return 1; + switch (man->last->type) { + case ROFFT_TEXT: + sp = man->last->string; + cp = ep = strchr(sp, '\0') - 2; + if (cp < sp || cp[0] != '\\' || cp[1] != 'c') + break; + while (cp > sp && cp[-1] == '\\') + cp--; + if ((ep - cp) % 2) + break; + *ep = '\0'; + return 1; + default: + break; + } + roff_elem_alloc(man, line, offs, ROFF_sp); + man->next = ROFF_NEXT_SIBLING; + return 1; + } - man_hash_init(); - p->data = data; - p->pflags = pflags; + /* + * Warn if the last un-escaped character is whitespace. Then + * strip away the remaining spaces (tabs stay!). + */ - man_alloc1(p); - return(p); -} + i = (int)strlen(buf); + assert(i); + if (' ' == buf[i - 1] || '\t' == buf[i - 1]) { + if (i > 1 && '\\' != buf[i - 2]) + mandoc_msg(MANDOCERR_SPACE_EOL, man->parse, + line, i - 1, NULL); -int -man_endparse(struct man *m) -{ + for (--i; i && ' ' == buf[i]; i--) + /* Spin back to non-space. */ ; - if (MAN_HALT & m->flags) - return(0); - else if (man_macroend(m)) - return(1); - m->flags |= MAN_HALT; - return(0); -} + /* Jump ahead of escaped whitespace. */ + i += '\\' == buf[i] ? 2 : 1; + buf[i] = '\0'; + } + roff_word_alloc(man, line, offs, buf + offs); -int -man_parseln(struct man *m, int ln, char *buf) -{ + /* + * End-of-sentence check. If the last character is an unescaped + * EOS character, then flag the node as being the end of a + * sentence. The front-end will know how to interpret this. + */ - return('.' == *buf || '\'' == *buf ? - man_pmacro(m, ln, buf) : - man_ptext(m, ln, buf)); -} + assert(i); + if (mandoc_eos(buf, (size_t)i)) + man->last->flags |= NODE_EOS; - -static void -man_free1(struct man *man) -{ - - if (man->first) - man_node_delete(man, man->first); - if (man->meta.title) - free(man->meta.title); - if (man->meta.source) - free(man->meta.source); - if (man->meta.vol) - free(man->meta.vol); + man_descope(man, line, offs); + return 1; } - -static void -man_alloc1(struct man *m) -{ - - memset(&m->meta, 0, sizeof(struct man_meta)); - m->flags = 0; - m->last = mandoc_calloc(1, sizeof(struct man_node)); - m->first = m->last; - m->last->type = MAN_ROOT; - m->last->tok = MAN_MAX; - m->next = MAN_NEXT_CHILD; -} - - static int -man_node_append(struct man *man, struct man_node *p) +man_pmacro(struct roff_man *man, int ln, char *buf, int offs) { + struct roff_node *n; + const char *cp; + size_t sz; + enum roff_tok tok; + int ppos; + int bline; - assert(man->last); - assert(man->first); - assert(MAN_ROOT != p->type); + /* Determine the line macro. */ - switch (man->next) { - case (MAN_NEXT_SIBLING): - man->last->next = p; - p->prev = man->last; - p->parent = man->last->parent; - break; - case (MAN_NEXT_CHILD): - man->last->child = p; - p->parent = man->last; - break; - default: - abort(); - /* NOTREACHED */ + ppos = offs; + tok = TOKEN_NONE; + for (sz = 0; sz < 4 && strchr(" \t\\", buf[offs]) == NULL; sz++) + offs++; + if (sz > 0 && sz < 4) + tok = roffhash_find(man->manmac, buf + ppos, sz); + if (tok == TOKEN_NONE) { + mandoc_msg(MANDOCERR_MACRO, man->parse, + ln, ppos, buf + ppos - 1); + return 1; } - - assert(p->parent); - p->parent->nchild++; - if ( ! man_valid_pre(man, p)) - return(0); + /* Skip a leading escape sequence or tab. */ - switch (p->type) { - case (MAN_HEAD): - assert(MAN_BLOCK == p->parent->type); - p->parent->head = p; + switch (buf[offs]) { + case '\\': + cp = buf + offs + 1; + mandoc_escape(&cp, NULL, NULL); + offs = cp - buf; break; - case (MAN_BODY): - assert(MAN_BLOCK == p->parent->type); - p->parent->body = p; + case '\t': + offs++; break; default: break; } - man->last = p; + /* Jump to the next non-whitespace word. */ - switch (p->type) { - case (MAN_TEXT): - if ( ! man_valid_post(man)) - return(0); - if ( ! man_action_post(man)) - return(0); - break; - default: - break; - } + while (buf[offs] == ' ') + offs++; - return(1); -} + /* + * Trailing whitespace. Note that tabs are allowed to be passed + * into the parser as "text", so we only warn about spaces here. + */ + if (buf[offs] == '\0' && buf[offs - 1] == ' ') + mandoc_msg(MANDOCERR_SPACE_EOL, man->parse, + ln, offs - 1, NULL); -static struct man_node * -man_node_alloc(int line, int pos, enum man_type type, enum mant tok) -{ - struct man_node *p; + /* + * Some macros break next-line scopes; otherwise, remember + * whether we are in next-line scope for a block head. + */ - p = mandoc_calloc(1, sizeof(struct man_node)); - p->line = line; - p->pos = pos; - p->type = type; - p->tok = tok; - return(p); -} + man_breakscope(man, tok); + bline = man->flags & MAN_BLINE; + /* + * If the line in next-line scope ends with \c, keep the + * next-line scope open for the subsequent input line. + * That is not at all portable, only groff >= 1.22.4 + * does it, but *if* this weird idiom occurs in a manual + * page, that's very likely what the author intended. + */ -int -man_elem_alloc(struct man *m, int line, int pos, enum mant tok) -{ - struct man_node *p; - - p = man_node_alloc(line, pos, MAN_ELEM, tok); - if ( ! man_node_append(m, p)) - return(0); - m->next = MAN_NEXT_CHILD; - return(1); -} - - -int -man_head_alloc(struct man *m, int line, int pos, enum mant tok) -{ - struct man_node *p; - - p = man_node_alloc(line, pos, MAN_HEAD, tok); - if ( ! man_node_append(m, p)) - return(0); - m->next = MAN_NEXT_CHILD; - return(1); -} - - -int -man_body_alloc(struct man *m, int line, int pos, enum mant tok) -{ - struct man_node *p; - - p = man_node_alloc(line, pos, MAN_BODY, tok); - if ( ! man_node_append(m, p)) - return(0); - m->next = MAN_NEXT_CHILD; - return(1); -} - - -int -man_block_alloc(struct man *m, int line, int pos, enum mant tok) -{ - struct man_node *p; - - p = man_node_alloc(line, pos, MAN_BLOCK, tok); - if ( ! man_node_append(m, p)) - return(0); - m->next = MAN_NEXT_CHILD; - return(1); -} - - -static int -pstring(struct man *m, int line, int pos, - const char *p, size_t len) -{ - struct man_node *n; - size_t sv; - - n = man_node_alloc(line, pos, MAN_TEXT, MAN_MAX); - n->string = mandoc_malloc(len + 1); - sv = strlcpy(n->string, p, len + 1); - - /* Prohibit truncation. */ - assert(sv < len + 1); - - if ( ! man_node_append(m, n)) - return(0); - m->next = MAN_NEXT_SIBLING; - return(1); -} - - -int -man_word_alloc(struct man *m, int line, int pos, const char *word) -{ - - return(pstring(m, line, pos, word, strlen(word))); -} - - -/* - * Free all of the resources held by a node. This does NOT unlink a - * node from its context; for that, see man_node_unlink(). - */ -static void -man_node_free(struct man_node *p) -{ - - if (p->string) - free(p->string); - free(p); -} - - -void -man_node_delete(struct man *m, struct man_node *p) -{ - - while (p->child) - man_node_delete(m, p->child); - - man_node_unlink(m, p); - man_node_free(p); -} - - -static int -man_ptext(struct man *m, int line, char *buf) -{ - int i, j; - char sv; - - /* Literal free-form text whitespace is preserved. */ - - if (MAN_LITERAL & m->flags) { - if ( ! man_word_alloc(m, line, 0, buf)) - return(0); - goto descope; + if (bline) { + cp = strchr(buf + offs, '\0') - 2; + if (cp >= buf && cp[0] == '\\' && cp[1] == 'c') + bline = 0; } - /* First de-chunk and allocate words. */ + /* Call to handler... */ - for (i = 0; ' ' == buf[i]; i++) - /* Skip leading whitespace. */ ; + assert(man_macro(tok)->fp != NULL); + (*man_macro(tok)->fp)(man, tok, ln, ppos, &offs, buf); - if ('\0' == buf[i]) { - /* Trailing whitespace? */ - if (i && ' ' == buf[i - 1]) - if ( ! man_pwarn(m, line, i - 1, WTSPACE)) - return(0); - if ( ! pstring(m, line, 0, &buf[i], 0)) - return(0); - goto descope; - } + /* In quick mode (for mandocdb), abort after the NAME section. */ - for (j = i; buf[i]; i++) { - if (' ' != buf[i]) - continue; - - /* Escaped whitespace. */ - if (i && ' ' == buf[i] && '\\' == buf[i - 1]) - continue; - - sv = buf[i]; - buf[i++] = '\0'; - - if ( ! pstring(m, line, j, &buf[j], (size_t)(i - j))) - return(0); - - /* Trailing whitespace? Check at overwritten byte. */ - - if (' ' == sv && '\0' == buf[i]) - if ( ! man_pwarn(m, line, i - 1, WTSPACE)) - return(0); - - for ( ; ' ' == buf[i]; i++) - /* Skip trailing whitespace. */ ; - - j = i; - - /* Trailing whitespace? */ - - if (' ' == buf[i - 1] && '\0' == buf[i]) - if ( ! man_pwarn(m, line, i - 1, WTSPACE)) - return(0); - - if ('\0' == buf[i]) - break; + if (man->quick && tok == MAN_SH) { + n = man->last; + if (n->type == ROFFT_BODY && + strcmp(n->prev->child->string, "NAME")) + return 2; } - if (j != i && ! pstring(m, line, j, &buf[j], (size_t)(i - j))) - return(0); - -descope: - /* - * Co-ordinate what happens with having a next-line scope open: - * first close out the element scope (if applicable), then close - * out the block scope (also if applicable). + * If we are in a next-line scope for a block head, + * close it out now and switch to the body, + * unless the next-line scope is allowed to continue. */ - if (MAN_ELINE & m->flags) { - m->flags &= ~MAN_ELINE; - if ( ! man_unscope(m, m->last->parent, WERRMAX)) - return(0); - } + if ( ! bline || man->flags & MAN_ELINE || + man_macro(tok)->flags & MAN_NSCOPED) + return 1; - if ( ! (MAN_BLINE & m->flags)) - return(1); - m->flags &= ~MAN_BLINE; + assert(man->flags & MAN_BLINE); + man->flags &= ~MAN_BLINE; - if ( ! man_unscope(m, m->last->parent, WERRMAX)) - return(0); - return(man_body_alloc(m, line, 0, m->last->tok)); + man_unscope(man, man->last->parent); + roff_body_alloc(man, ln, ppos, man->last->tok); + return 1; } - -static int -macrowarn(struct man *m, int ln, const char *buf) +void +man_breakscope(struct roff_man *man, int tok) { - if ( ! (MAN_IGN_MACRO & m->pflags)) - return(man_verr(m, ln, 0, - "unknown macro: %s%s", - buf, strlen(buf) > 3 ? "..." : "")); - return(man_vwarn(m, ln, 0, "unknown macro: %s%s", - buf, strlen(buf) > 3 ? "..." : "")); -} + struct roff_node *n; - -int -man_pmacro(struct man *m, int ln, char *buf) -{ - int i, j, ppos; - enum mant tok; - char mac[5]; - struct man_node *n; - - /* Comments and empties are quickly ignored. */ - - if ('\0' == buf[1]) - return(1); - - i = 1; - /* - * Skip whitespace between the control character and initial - * text. "Whitespace" is both spaces and tabs. + * An element next line scope is open, + * and the new macro is not allowed inside elements. + * Delete the element that is being broken. */ - if (' ' == buf[i] || '\t' == buf[i]) { - i++; - while (buf[i] && (' ' == buf[i] || '\t' == buf[i])) - i++; - if ('\0' == buf[i]) - goto out; - } - ppos = i; + if (man->flags & MAN_ELINE && (tok < MAN_TH || + (man_macro(tok)->flags & MAN_NSCOPED) == 0)) { + n = man->last; + if (n->type == ROFFT_TEXT) + n = n->parent; + if (n->tok < MAN_TH || + man_macro(n->tok)->flags & MAN_NSCOPED) + n = n->parent; - /* Copy the first word into a nil-terminated buffer. */ + mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, + n->line, n->pos, "%s breaks %s", + roff_name[tok], roff_name[n->tok]); - for (j = 0; j < 4; j++, i++) { - if ('\0' == (mac[j] = buf[i])) - break; - else if (' ' == buf[i]) - break; - - /* Check for invalid characters. */ - - if (isgraph((u_char)buf[i])) - continue; - return(man_perr(m, ln, i, WNPRINT)); + roff_node_delete(man, n); + man->flags &= ~MAN_ELINE; } - mac[j] = '\0'; - - if (j == 4 || j < 1) { - if ( ! (MAN_IGN_MACRO & m->pflags)) { - (void)man_perr(m, ln, ppos, WMACROFORM); - goto err; - } - if ( ! man_pwarn(m, ln, ppos, WMACROFORM)) - goto err; - return(1); - } - - if (MAN_MAX == (tok = man_hash_find(mac))) { - if ( ! macrowarn(m, ln, mac)) - goto err; - return(1); - } - - /* The macro is sane. Jump to the next word. */ - - while (buf[i] && ' ' == buf[i]) - i++; - - /* Trailing whitespace? */ - - if ('\0' == buf[i] && ' ' == buf[i - 1]) - if ( ! man_pwarn(m, ln, i - 1, WTSPACE)) - goto err; - - /* - * Remove prior ELINE macro, as it's being clobbering by a new - * macro. Note that NSCOPED macros do not close out ELINE - * macros---they don't print text---so we let those slip by. - * NOTE: we don't allow roff blocks (NOCLOSE) to be embedded - * here because that would stipulate blocks as children of - * elements! - */ - - if ( ! (MAN_NSCOPED & man_macros[tok].flags) && - m->flags & MAN_ELINE) { - assert(MAN_TEXT != m->last->type); - - /* - * This occurs in the following construction: - * .B - * .br - * .B - * .br - * I hate man macros. - * Flat-out disallow this madness. - */ - if (MAN_NSCOPED & man_macros[m->last->tok].flags) - return(man_perr(m, ln, ppos, WLNSCOPE)); - - n = m->last; - - assert(n); - assert(NULL == n->child); - assert(0 == n->nchild); - - if ( ! man_nwarn(m, n, WLNSCOPE)) - return(0); - - man_node_delete(m, n); - m->flags &= ~MAN_ELINE; - } - /* - * Save the fact that we're in the next-line for a block. In - * this way, embedded roff instructions can "remember" state - * when they exit. + * Weird special case: + * Switching fill mode closes section headers. */ - if (MAN_BLINE & m->flags) - m->flags |= MAN_BPLINE; - - /* Call to handler... */ - - assert(man_macros[tok].fp); - if ( ! (*man_macros[tok].fp)(m, tok, ln, ppos, &i, buf)) - goto err; - -out: - /* - * We weren't in a block-line scope when entering the - * above-parsed macro, so return. - */ - - if ( ! (MAN_BPLINE & m->flags)) { - m->flags &= ~MAN_ILINE; - return(1); + if (man->flags & MAN_BLINE && + (tok == MAN_nf || tok == MAN_fi) && + (man->last->tok == MAN_SH || man->last->tok == MAN_SS)) { + n = man->last; + man_unscope(man, n); + roff_body_alloc(man, n->line, n->pos, n->tok); + man->flags &= ~MAN_BLINE; } - m->flags &= ~MAN_BPLINE; /* - * If we're in a block scope, then allow this macro to slip by - * without closing scope around it. + * A block header next line scope is open, + * and the new macro is not allowed inside block headers. + * Delete the block that is being broken. */ - if (MAN_ILINE & m->flags) { - m->flags &= ~MAN_ILINE; - return(1); - } + if (man->flags & MAN_BLINE && (tok < MAN_TH || + man_macro(tok)->flags & MAN_BSCOPE)) { + n = man->last; + if (n->type == ROFFT_TEXT) + n = n->parent; + if (n->tok < MAN_TH || + (man_macro(n->tok)->flags & MAN_BSCOPE) == 0) + n = n->parent; - /* - * If we've opened a new next-line element scope, then return - * now, as the next line will close out the block scope. - */ + assert(n->type == ROFFT_HEAD); + n = n->parent; + assert(n->type == ROFFT_BLOCK); + assert(man_macro(n->tok)->flags & MAN_SCOPED); - if (MAN_ELINE & m->flags) - return(1); + mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, + n->line, n->pos, "%s breaks %s", + roff_name[tok], roff_name[n->tok]); - /* Close out the block scope opened in the prior line. */ - - assert(MAN_BLINE & m->flags); - m->flags &= ~MAN_BLINE; - - if ( ! man_unscope(m, m->last->parent, WERRMAX)) - return(0); - return(man_body_alloc(m, ln, 0, m->last->tok)); - -err: /* Error out. */ - - m->flags |= MAN_HALT; - return(0); + roff_node_delete(man, n); + man->flags &= ~MAN_BLINE; + } } - -int -man_verr(struct man *man, int ln, int pos, const char *fmt, ...) +void +man_state(struct roff_man *man, struct roff_node *n) { - char buf[256]; - va_list ap; - if (NULL == man->cb.man_err) - return(0); - - va_start(ap, fmt); - (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap); - va_end(ap); - return((*man->cb.man_err)(man->data, ln, pos, buf)); + switch(n->tok) { + case MAN_nf: + case MAN_EX: + if (man->flags & MAN_LITERAL && ! (n->flags & NODE_VALID)) + mandoc_msg(MANDOCERR_NF_SKIP, man->parse, + n->line, n->pos, "nf"); + man->flags |= MAN_LITERAL; + break; + case MAN_fi: + case MAN_EE: + if ( ! (man->flags & MAN_LITERAL) && + ! (n->flags & NODE_VALID)) + mandoc_msg(MANDOCERR_FI_SKIP, man->parse, + n->line, n->pos, "fi"); + man->flags &= ~MAN_LITERAL; + break; + default: + break; + } + man->last->flags |= NODE_VALID; } - -int -man_vwarn(struct man *man, int ln, int pos, const char *fmt, ...) +void +man_validate(struct roff_man *man) { - char buf[256]; - va_list ap; - if (NULL == man->cb.man_warn) - return(0); - - va_start(ap, fmt); - (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap); - va_end(ap); - return((*man->cb.man_warn)(man->data, ln, pos, buf)); -} - - -int -man_err(struct man *m, int line, int pos, int iserr, enum merr type) -{ - const char *p; - - p = __man_merrnames[(int)type]; - assert(p); - - if (iserr) - return(man_verr(m, line, pos, p)); - - return(man_vwarn(m, line, pos, p)); -} - - -/* - * Unlink a node from its context. If "m" is provided, the last parse - * point will also be adjusted accordingly. - */ -static void -man_node_unlink(struct man *m, struct man_node *n) -{ - - /* Adjust siblings. */ - - if (n->prev) - n->prev->next = n->next; - if (n->next) - n->next->prev = n->prev; - - /* Adjust parent. */ - - if (n->parent) { - n->parent->nchild--; - if (n->parent->child == n) - n->parent->child = n->prev ? n->prev : n->next; - } - - /* Adjust parse point, if applicable. */ - - if (m && m->last == n) { - /*XXX: this can occur when bailing from validation. */ - /*assert(NULL == n->next);*/ - if (n->prev) { - m->last = n->prev; - m->next = MAN_NEXT_SIBLING; - } else { - m->last = n->parent; - m->next = MAN_NEXT_CHILD; - } - } - - if (m && m->first == n) - m->first = NULL; + man->last = man->first; + man_node_validate(man); + man->flags &= ~MAN_LITERAL; }