=================================================================== RCS file: /cvs/mandoc/man.c,v retrieving revision 1.22 retrieving revision 1.138 diff -u -p -r1.22 -r1.138 --- mandoc/man.c 2009/06/18 10:32:00 1.22 +++ mandoc/man.c 2014/08/10 23:54:41 1.138 @@ -1,6 +1,8 @@ -/* $Id: man.c,v 1.22 2009/06/18 10:32:00 kristaps Exp $ */ +/* $Id: man.c,v 1.138 2014/08/10 23:54:41 schwarze Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons + * Copyright (c) 2013, 2014 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 @@ -14,6 +16,10 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include "config.h" + +#include + #include #include #include @@ -21,142 +27,134 @@ #include #include +#include "man.h" +#include "mandoc.h" +#include "mandoc_aux.h" #include "libman.h" +#include "libmandoc.h" -const char *const __man_macronames[MAN_MAX] = { +const char *const __man_macronames[MAN_MAX] = { "br", "TH", "SH", "SS", - "TP", "LP", "PP", "P", + "TP", "LP", "PP", "P", "IP", "HP", "SM", "SB", "BI", "IB", "BR", "RB", "R", "B", "I", "IR", - "RI", "na", "i" + "RI", "na", "sp", "nf", + "fi", "RE", "RS", "DT", + "UC", "PD", "AT", "in", + "ft", "OP", "EX", "EE", + "UR", "UE", "ll" }; const char * const *man_macronames = __man_macronames; -static struct man_node *man_node_alloc(int, int, - enum man_type, int); -static int man_node_append(struct man *, +static struct man_node *man_node_alloc(struct man *, int, int, + enum man_type, enum mant); +static int man_node_append(struct man *, struct man_node *); -static int man_ptext(struct man *, int, char *); -static int man_pmacro(struct man *, int, char *); +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 *, int); +static int man_pmacro(struct man *, int, char *, int); static void man_free1(struct man *); -static int man_alloc1(struct man *); +static void man_alloc1(struct man *); +static int man_descope(struct man *, int, int); const struct man_node * -man_node(const struct man *m) +man_node(const struct man *man) { - return(MAN_HALT & m->flags ? NULL : m->first); + return(man->first); } - const struct man_meta * -man_meta(const struct man *m) +man_meta(const struct man *man) { - return(MAN_HALT & m->flags ? NULL : &m->meta); + return(&man->meta); } - -int +void man_reset(struct man *man) { man_free1(man); - return(man_alloc1(man)); + man_alloc1(man); } - void man_free(struct man *man) { man_free1(man); - - if (man->htab) - man_hash_free(man->htab); free(man); } - struct man * -man_alloc(void *data, int pflags, const struct man_cb *cb) +man_alloc(struct roff *roff, struct mparse *parse, int quick) { struct man *p; - if (NULL == (p = calloc(1, sizeof(struct man)))) - return(NULL); + p = mandoc_calloc(1, sizeof(struct man)); - if ( ! man_alloc1(p)) { - free(p); - return(NULL); - } + man_hash_init(); + p->parse = parse; + p->quick = quick; + p->roff = roff; - p->data = data; - p->pflags = pflags; - (void)memcpy(&p->cb, cb, sizeof(struct man_cb)); - - if (NULL == (p->htab = man_hash_alloc())) { - free(p); - return(NULL); - } + man_alloc1(p); return(p); } - int -man_endparse(struct man *m) +man_endparse(struct man *man) { - if (MAN_HALT & m->flags) - return(0); - else if (man_macroend(m)) - return(1); - m->flags |= MAN_HALT; - return(0); + return(man_macroend(man)); } - int -man_parseln(struct man *m, int ln, char *buf) +man_parseln(struct man *man, int ln, char *buf, int offs) { - return('.' == *buf ? - man_pmacro(m, ln, buf) : - man_ptext(m, ln, buf)); + man->flags |= MAN_NEWLINE; + + return (roff_getcontrol(man->roff, buf, &offs) ? + man_pmacro(man, ln, buf, offs) : + man_ptext(man, ln, buf, offs)); } - static void man_free1(struct man *man) { if (man->first) - man_node_freelist(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.date) + free(man->meta.date); if (man->meta.vol) free(man->meta.vol); + if (man->meta.msec) + free(man->meta.msec); } - -static int -man_alloc1(struct man *m) +static void +man_alloc1(struct man *man) { - bzero(&m->meta, sizeof(struct man_meta)); - m->flags = 0; - m->last = calloc(1, sizeof(struct man_node)); - if (NULL == m->last) - return(0); - m->first = m->last; - m->last->type = MAN_ROOT; - m->next = MAN_NEXT_CHILD; - return(1); + memset(&man->meta, 0, sizeof(struct man_meta)); + man->flags = 0; + man->last = mandoc_calloc(1, sizeof(struct man_node)); + man->first = man->last; + man->last->type = MAN_ROOT; + man->last->tok = MAN_MAX; + man->next = MAN_NEXT_CHILD; } @@ -169,12 +167,12 @@ man_node_append(struct man *man, struct man_node *p) assert(MAN_ROOT != p->type); switch (man->next) { - case (MAN_NEXT_SIBLING): + case MAN_NEXT_SIBLING: man->last->next = p; p->prev = man->last; p->parent = man->last->parent; break; - case (MAN_NEXT_CHILD): + case MAN_NEXT_CHILD: man->last->child = p; p->parent = man->last; break; @@ -182,17 +180,39 @@ man_node_append(struct man *man, struct man_node *p) abort(); /* NOTREACHED */ } - + + assert(p->parent); p->parent->nchild++; + switch (p->type) { + case MAN_BLOCK: + if (p->tok == MAN_SH || p->tok == MAN_SS) + man->flags &= ~MAN_LITERAL; + break; + case MAN_HEAD: + assert(MAN_BLOCK == p->parent->type); + p->parent->head = p; + break; + case MAN_TAIL: + assert(MAN_BLOCK == p->parent->type); + p->parent->tail = p; + break; + case MAN_BODY: + assert(MAN_BLOCK == p->parent->type); + p->parent->body = p; + break; + default: + break; + } + man->last = p; switch (p->type) { - case (MAN_TEXT): + case MAN_TBL: + /* FALLTHROUGH */ + case MAN_TEXT: if ( ! man_valid_post(man)) return(0); - if ( ! man_action_post(man)) - return(0); break; default: break; @@ -201,52 +221,104 @@ man_node_append(struct man *man, struct man_node *p) return(1); } - static struct man_node * -man_node_alloc(int line, int pos, enum man_type type, int tok) +man_node_alloc(struct man *man, int line, int pos, + enum man_type type, enum mant tok) { struct man_node *p; - p = calloc(1, sizeof(struct man_node)); - if (NULL == p) - return(NULL); - + p = mandoc_calloc(1, sizeof(struct man_node)); p->line = line; p->pos = pos; p->type = type; p->tok = tok; + + if (MAN_NEWLINE & man->flags) + p->flags |= MAN_LINE; + man->flags &= ~MAN_NEWLINE; return(p); } +int +man_elem_alloc(struct man *man, int line, int pos, enum mant tok) +{ + struct man_node *p; + p = man_node_alloc(man, line, pos, MAN_ELEM, tok); + if ( ! man_node_append(man, p)) + return(0); + man->next = MAN_NEXT_CHILD; + return(1); +} + int -man_elem_alloc(struct man *man, int line, int pos, int tok) +man_tail_alloc(struct man *man, int line, int pos, enum mant tok) { struct man_node *p; - p = man_node_alloc(line, pos, MAN_ELEM, tok); - if (NULL == p) + p = man_node_alloc(man, line, pos, MAN_TAIL, tok); + if ( ! man_node_append(man, p)) return(0); - return(man_node_append(man, p)); + man->next = MAN_NEXT_CHILD; + return(1); } +int +man_head_alloc(struct man *man, int line, int pos, enum mant tok) +{ + struct man_node *p; + p = man_node_alloc(man, line, pos, MAN_HEAD, tok); + if ( ! man_node_append(man, p)) + return(0); + man->next = MAN_NEXT_CHILD; + return(1); +} + int -man_word_alloc(struct man *man, - int line, int pos, const char *word) +man_body_alloc(struct man *man, int line, int pos, enum mant tok) { - struct man_node *p; + struct man_node *p; - p = man_node_alloc(line, pos, MAN_TEXT, -1); - if (NULL == p) + p = man_node_alloc(man, line, pos, MAN_BODY, tok); + if ( ! man_node_append(man, p)) return(0); - if (NULL == (p->string = strdup(word))) + man->next = MAN_NEXT_CHILD; + return(1); +} + +int +man_block_alloc(struct man *man, int line, int pos, enum mant tok) +{ + struct man_node *p; + + p = man_node_alloc(man, line, pos, MAN_BLOCK, tok); + if ( ! man_node_append(man, p)) return(0); - return(man_node_append(man, p)); + man->next = MAN_NEXT_CHILD; + return(1); } +int +man_word_alloc(struct man *man, int line, int pos, const char *word) +{ + struct man_node *n; -void + n = man_node_alloc(man, line, pos, MAN_TEXT, MAN_MAX); + n->string = roff_strdup(man->roff, word); + + if ( ! man_node_append(man, n)) + return(0); + + man->next = MAN_NEXT_SIBLING; + return(1); +} + +/* + * 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) { @@ -255,182 +327,376 @@ man_node_free(struct man_node *p) free(p); } - void -man_node_freelist(struct man_node *p) +man_node_delete(struct man *man, struct man_node *p) { - if (p->child) - man_node_freelist(p->child); - if (p->next) - man_node_freelist(p->next); + while (p->child) + man_node_delete(man, p->child); + man_node_unlink(man, p); man_node_free(p); } +int +man_addeqn(struct man *man, const struct eqn *ep) +{ + struct man_node *n; -static int -man_ptext(struct man *m, int line, char *buf) + n = man_node_alloc(man, ep->ln, ep->pos, MAN_EQN, MAN_MAX); + n->eqn = ep; + + if ( ! man_node_append(man, n)) + return(0); + + man->next = MAN_NEXT_SIBLING; + return(man_descope(man, ep->ln, ep->pos)); +} + +int +man_addspan(struct man *man, const struct tbl_span *sp) { + struct man_node *n; - if ( ! man_word_alloc(m, line, 0, buf)) + n = man_node_alloc(man, sp->line, 0, MAN_TBL, MAN_MAX); + n->span = sp; + + if ( ! man_node_append(man, n)) return(0); - m->next = MAN_NEXT_SIBLING; + man->next = MAN_NEXT_SIBLING; + return(man_descope(man, sp->line, 0)); +} + +static int +man_descope(struct man *man, int line, int offs) +{ /* - * If this is one of the zany NLINE macros that consumes the - * next line of input as being influenced, then close out the - * existing macro "scope" and continue processing. + * 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 ( ! (MAN_NLINE & m->flags)) + if (MAN_ELINE & man->flags) { + man->flags &= ~MAN_ELINE; + if ( ! man_unscope(man, man->last->parent)) + return(0); + } + + if ( ! (MAN_BLINE & man->flags)) return(1); + man->flags &= ~MAN_BLINE; - m->flags &= ~MAN_NLINE; - m->last = m->last->parent; - - assert(MAN_ROOT != m->last->type); - if ( ! man_valid_post(m)) + if ( ! man_unscope(man, man->last->parent)) return(0); - if ( ! man_action_post(m)) - return(0); - - return(1); + return(man_body_alloc(man, line, offs, man->last->tok)); } - -int -man_pmacro(struct man *m, int ln, char *buf) +static int +man_ptext(struct man *man, int line, char *buf, int offs) { - int i, j, c, ppos, fl; - char mac[5]; - struct man_node *n; + int i; - /* Comments and empties are quickly ignored. */ + /* Literal free-form text whitespace is preserved. */ - n = m->last; - fl = MAN_NLINE & m->flags; + if (MAN_LITERAL & man->flags) { + if ( ! man_word_alloc(man, line, offs, buf + offs)) + return(0); + return(man_descope(man, line, offs)); + } - if (0 == buf[1]) - goto out; + for (i = offs; ' ' == buf[i]; i++) + /* Skip leading whitespace. */ ; - i = 1; + /* + * Blank lines are ignored right after headings + * but add a single vertical space elsewhere. + */ - if (' ' == buf[i]) { - i++; - while (buf[i] && ' ' == buf[i]) - i++; - if (0 == buf[i]) - goto out; + if ('\0' == buf[i]) { + /* Allocate a blank entry. */ + if (MAN_SH != man->last->tok && + MAN_SS != man->last->tok) { + if ( ! man_elem_alloc(man, line, offs, MAN_sp)) + return(0); + man->next = MAN_NEXT_SIBLING; + } + return(1); } - ppos = i; + /* + * Warn if the last un-escaped character is whitespace. Then + * strip away the remaining spaces (tabs stay!). + */ - /* Copy the first word into a nil-terminated buffer. */ + i = (int)strlen(buf); + assert(i); - for (j = 0; j < 4; j++, i++) { - if (0 == (mac[j] = buf[i])) - break; - else if (' ' == buf[i]) - break; + 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); + + for (--i; i && ' ' == buf[i]; i--) + /* Spin back to non-space. */ ; + + /* Jump ahead of escaped whitespace. */ + i += '\\' == buf[i] ? 2 : 1; + + buf[i] = '\0'; } - mac[j] = 0; + if ( ! man_word_alloc(man, line, offs, buf + offs)) + return(0); - if (j == 4 || j < 1) { - if ( ! (MAN_IGN_MACRO & m->pflags)) { - (void)man_verr(m, ln, ppos, - "ill-formed macro: %s", mac); - goto err; - } - if ( ! man_vwarn(m, ln, ppos, - "ill-formed macro: %s", mac)) - goto err; + /* + * 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. + */ + + assert(i); + if (mandoc_eos(buf, (size_t)i)) + man->last->flags |= MAN_EOS; + + return(man_descope(man, line, offs)); +} + +static int +man_pmacro(struct man *man, int ln, char *buf, int offs) +{ + char mac[5]; + struct man_node *n; + enum mant tok; + int i, ppos; + int bline; + + if ('"' == buf[offs]) { + mandoc_msg(MANDOCERR_COMMENT_BAD, man->parse, + ln, offs, NULL); return(1); - } - - if (MAN_MAX == (c = man_hash_find(m->htab, mac))) { - if ( ! (MAN_IGN_MACRO & m->pflags)) { - (void)man_verr(m, ln, ppos, - "unknown macro: %s", mac); - goto err; - } - if ( ! man_vwarn(m, ln, ppos, - "unknown macro: %s", mac)) - goto err; + } else if ('\0' == buf[offs]) return(1); + + ppos = offs; + + /* + * Copy the first word into a nil-terminated buffer. + * Stop copying when a tab, space, or eoln is encountered. + */ + + i = 0; + while (i < 4 && '\0' != buf[offs] && ' ' != buf[offs] && + '\t' != buf[offs]) + mac[i++] = buf[offs++]; + + mac[i] = '\0'; + + tok = (i > 0 && i < 4) ? man_hash_find(mac) : MAN_MAX; + + if (MAN_MAX == tok) { + mandoc_msg(MANDOCERR_MACRO, man->parse, + ln, ppos, buf + ppos - 1); + return(1); } /* The macro is sane. Jump to the next word. */ - while (buf[i] && ' ' == buf[i]) - i++; + while (buf[offs] && ' ' == buf[offs]) + offs++; - /* Begin recursive parse sequence. */ + /* + * Trailing whitespace. Note that tabs are allowed to be passed + * into the parser as "text", so we only warn about spaces here. + */ - if ( ! man_macro(m, c, ln, ppos, &i, buf)) - goto err; + if ('\0' == buf[offs] && ' ' == buf[offs - 1]) + mandoc_msg(MANDOCERR_SPACE_EOL, man->parse, + ln, offs - 1, NULL); -out: - if (fl) { - /* - * A NLINE macro has been immediately followed with - * another. Close out the preceding macro's scope, and - * continue. + /* + * Remove prior ELINE macro, as it's being clobbered 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. + */ + + if ( ! (MAN_NSCOPED & man_macros[tok].flags) && + man->flags & MAN_ELINE) { + n = man->last; + assert(MAN_TEXT != n->type); + + /* Remove repeated NSCOPED macros causing ELINE. */ + + if (MAN_NSCOPED & man_macros[n->tok].flags) + n = n->parent; + + mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, n->line, + n->pos, "%s breaks %s", man_macronames[tok], + man_macronames[n->tok]); + + man_node_delete(man, n); + man->flags &= ~MAN_ELINE; + } + + /* + * Remove prior BLINE macro that is being clobbered. + */ + if ((man->flags & MAN_BLINE) && + (MAN_BSCOPE & man_macros[tok].flags)) { + n = man->last; + + /* Might be a text node like 8 in + * .TP 8 + * .SH foo */ - assert(MAN_ROOT != m->last->type); - assert(m->last->parent); - assert(MAN_ROOT != m->last->parent->type); + if (MAN_TEXT == n->type) + n = n->parent; - if (n != m->last) - m->last = m->last->parent; + /* Remove element that didn't end BLINE, if any. */ + if ( ! (MAN_BSCOPE & man_macros[n->tok].flags)) + n = n->parent; - if ( ! man_valid_post(m)) - return(0); - if ( ! man_action_post(m)) - return(0); - m->next = MAN_NEXT_SIBLING; - m->flags &= ~MAN_NLINE; - } + assert(MAN_HEAD == n->type); + n = n->parent; + assert(MAN_BLOCK == n->type); + assert(MAN_SCOPED & man_macros[n->tok].flags); - return(1); + mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, n->line, + n->pos, "%s breaks %s", man_macronames[tok], + man_macronames[n->tok]); -err: /* Error out. */ + man_node_delete(man, n); + man->flags &= ~MAN_BLINE; + } - m->flags |= MAN_HALT; - return(0); -} + /* Remember whether we are in next-line scope for a block head. */ + bline = man->flags & MAN_BLINE; -int -man_verr(struct man *man, int ln, int pos, const char *fmt, ...) -{ - char buf[256]; - va_list ap; + /* Call to handler... */ - if (NULL == man->cb.man_err) + assert(man_macros[tok].fp); + if ( ! (*man_macros[tok].fp)(man, tok, ln, ppos, &offs, buf)) 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)); -} + /* In quick mode (for mandocdb), abort after the NAME section. */ + if (man->quick && MAN_SH == tok) { + n = man->last; + if (MAN_BODY == n->type && + strcmp(n->prev->child->string, "NAME")) + return(2); + } -int -man_vwarn(struct man *man, int ln, int pos, const char *fmt, ...) -{ - char buf[256]; - va_list ap; + /* + * 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 (NULL == man->cb.man_warn) + if ( ! bline || man->flags & MAN_ELINE || + man_macros[tok].flags & MAN_NSCOPED) + return(1); + + assert(MAN_BLINE & man->flags); + man->flags &= ~MAN_BLINE; + + if ( ! man_unscope(man, man->last->parent)) return(0); + return(man_body_alloc(man, ln, ppos, man->last->tok)); +} - 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)); +/* + * Unlink a node from its context. If "man" is provided, the last parse + * point will also be adjusted accordingly. + */ +static void +man_node_unlink(struct man *man, 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 (man && man->last == n) { + /*XXX: this can occur when bailing from validation. */ + /*assert(NULL == n->next);*/ + if (n->prev) { + man->last = n->prev; + man->next = MAN_NEXT_SIBLING; + } else { + man->last = n->parent; + man->next = MAN_NEXT_CHILD; + } + } + + if (man && man->first == n) + man->first = NULL; } +const struct mparse * +man_mparse(const struct man *man) +{ + assert(man && man->parse); + return(man->parse); +} + +void +man_deroff(char **dest, const struct man_node *n) +{ + char *cp; + size_t sz; + + if (MAN_TEXT != n->type) { + for (n = n->child; n; n = n->next) + man_deroff(dest, n); + return; + } + + /* Skip leading whitespace and escape sequences. */ + + cp = n->string; + while ('\0' != *cp) { + if ('\\' == *cp) { + cp++; + mandoc_escape((const char **)&cp, NULL, NULL); + } else if (isspace((unsigned char)*cp)) + cp++; + else + break; + } + + /* Skip trailing whitespace. */ + + for (sz = strlen(cp); sz; sz--) + if (0 == isspace((unsigned char)cp[sz-1])) + break; + + /* Skip empty strings. */ + + if (0 == sz) + return; + + if (NULL == *dest) { + *dest = mandoc_strndup(cp, sz); + return; + } + + mandoc_asprintf(&cp, "%s %*s", *dest, (int)sz, cp); + free(*dest); + *dest = cp; +}