=================================================================== RCS file: /cvs/mandoc/roff.c,v retrieving revision 1.206 retrieving revision 1.217 diff -u -p -r1.206 -r1.217 --- mandoc/roff.c 2014/04/08 01:37:27 1.206 +++ mandoc/roff.c 2014/07/04 16:12:08 1.217 @@ -1,4 +1,4 @@ -/* $Id: roff.c,v 1.206 2014/04/08 01:37:27 schwarze Exp $ */ +/* $Id: roff.c,v 1.217 2014/07/04 16:12:08 schwarze Exp $ */ /* * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons * Copyright (c) 2010-2014 Ingo Schwarze @@ -137,7 +137,7 @@ struct roffnode { #define ROFF_ARGS struct roff *r, /* parse ctx */ \ enum rofft tok, /* tok of macro */ \ - char **bufp, /* input buffer */ \ + char **bufp, /* input buffer */ \ size_t *szp, /* size of input buffer */ \ int ln, /* parse line */ \ int ppos, /* original pos in buffer */ \ @@ -187,28 +187,29 @@ static int roff_evalstrcond(const char *, int *); static void roff_free1(struct roff *); static void roff_freereg(struct roffreg *); static void roff_freestr(struct roffkv *); -static char *roff_getname(struct roff *, char **, int, int); +static size_t roff_getname(struct roff *, char **, int, int); static int roff_getnum(const char *, int *, int *); static int roff_getop(const char *, int *, char *); static int roff_getregn(const struct roff *, const char *, size_t); static int roff_getregro(const char *name); -static const char *roff_getstrn(const struct roff *, +static const char *roff_getstrn(const struct roff *, const char *, size_t); static enum rofferr roff_it(ROFF_ARGS); static enum rofferr roff_line_ignore(ROFF_ARGS); static enum rofferr roff_nr(ROFF_ARGS); static void roff_openeqn(struct roff *, const char *, int, int, const char *); -static enum rofft roff_parse(struct roff *, const char *, int *); +static enum rofft roff_parse(struct roff *, char *, int *, + int, int); static enum rofferr roff_parsetext(char **, size_t *, int, int *); -static enum rofferr roff_res(struct roff *, +static enum rofferr roff_res(struct roff *, char **, size_t *, int, int); static enum rofferr roff_rm(ROFF_ARGS); static enum rofferr roff_rr(ROFF_ARGS); static void roff_setstr(struct roff *, const char *, const char *, int); -static void roff_setstrn(struct roffkv **, const char *, +static void roff_setstrn(struct roffkv **, const char *, size_t, const char *, size_t, int); static enum rofferr roff_so(ROFF_ARGS); static enum rofferr roff_tr(ROFF_ARGS); @@ -315,6 +316,7 @@ static const struct predef predefs[PREDEFS_MAX] = { static int roffit_lines; /* number of lines to delay */ static char *roffit_macro; /* nil-terminated macro line */ + static void roffhash_init(void) { @@ -367,7 +369,6 @@ roffhash_find(const char *p, size_t s) return(ROFF_MAX); } - /* * Pop the current node off of the stack of roff instructions currently * pending. @@ -378,7 +379,7 @@ roffnode_pop(struct roff *r) struct roffnode *p; assert(r->last); - p = r->last; + p = r->last; r->last = r->last->parent; free(p->name); @@ -386,7 +387,6 @@ roffnode_pop(struct roff *r) free(p); } - /* * Push a roff node onto the instruction stack. This must later be * removed with roffnode_pop(). @@ -409,7 +409,6 @@ roffnode_push(struct roff *r, enum rofft tok, const ch r->last = p; } - static void roff_free1(struct roff *r) { @@ -459,7 +458,6 @@ roff_reset(struct roff *r) r->control = 0; } - void roff_free(struct roff *r) { @@ -468,7 +466,6 @@ roff_free(struct roff *r) free(r); } - struct roff * roff_alloc(struct mparse *parse, int options) { @@ -478,7 +475,7 @@ roff_alloc(struct mparse *parse, int options) r->parse = parse; r->options = options; r->rstackpos = -1; - + roffhash_init(); return(r); @@ -492,16 +489,15 @@ roff_alloc(struct mparse *parse, int options) static enum rofferr roff_res(struct roff *r, char **bufp, size_t *szp, int ln, int pos) { - char ubuf[12]; /* buffer to print the number */ + char ubuf[24]; /* buffer to print the number */ const char *start; /* start of the string to process */ - const char *stesc; /* start of an escape sequence ('\\') */ + char *stesc; /* start of an escape sequence ('\\') */ const char *stnam; /* start of the name, after "[(*" */ const char *cp; /* end of the name, e.g. before ']' */ const char *res; /* the string to be substituted */ char *nbuf; /* new buffer to copy bufp to */ size_t maxl; /* expected length of the escape name */ size_t naml; /* actual length of the escape name */ - size_t ressz; /* size of the replacement string */ int expand_count; /* to avoid infinite loops */ int npos; /* position in numeric expression */ int irc; /* return code from roff_evalnum() */ @@ -524,7 +520,7 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int break; if (0 == (stesc - cp) % 2) { - stesc = cp; + stesc = (char *)cp; continue; } @@ -533,15 +529,15 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int term = '\0'; cp = stesc + 1; switch (*cp) { - case ('*'): + case '*': res = NULL; break; - case ('B'): + case 'B': /* FALLTHROUGH */ - case ('w'): + case 'w': term = cp[1]; /* FALLTHROUGH */ - case ('n'): + case 'n': res = ubuf; break; default: @@ -565,14 +561,14 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int if ('\0' == term) { switch (*++cp) { - case ('\0'): + case '\0': maxl = 0; break; - case ('('): + case '(': cp++; maxl = 2; break; - case ('['): + case '[': cp++; term = ']'; maxl = 0; @@ -591,10 +587,8 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int for (naml = 0; 0 == maxl || naml < maxl; naml++, cp++) { if ('\0' == *cp) { - mandoc_msg - (MANDOCERR_BADESCAPE, - r->parse, ln, - (int)(stesc - *bufp), NULL); + mandoc_msg(MANDOCERR_BADESCAPE, r->parse, + ln, (int)(stesc - *bufp), NULL); break; } if (0 == maxl && *cp == term) { @@ -609,47 +603,42 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int */ switch (stesc[1]) { - case ('*'): + case '*': res = roff_getstrn(r, stnam, naml); break; - case ('B'): + case 'B': npos = 0; irc = roff_evalnum(stnam, &npos, NULL, 0); ubuf[0] = irc && stnam + npos + 1 == cp ? '1' : '0'; ubuf[1] = '\0'; break; - case ('n'): - snprintf(ubuf, sizeof(ubuf), "%d", + case 'n': + (void)snprintf(ubuf, sizeof(ubuf), "%d", roff_getregn(r, stnam, naml)); break; - case ('w'): - snprintf(ubuf, sizeof(ubuf), "%d", + case 'w': + (void)snprintf(ubuf, sizeof(ubuf), "%d", 24 * (int)naml); break; } if (NULL == res) { - mandoc_msg - (MANDOCERR_BADESCAPE, r->parse, - ln, (int)(stesc - *bufp), NULL); + mandoc_msg(MANDOCERR_BADESCAPE, r->parse, + ln, (int)(stesc - *bufp), NULL); res = ""; } - ressz = strlen(res); /* Replace the escape sequence by the string. */ - *szp += ressz + 1; - nbuf = mandoc_malloc(*szp); + *stesc = '\0'; + *szp = mandoc_asprintf(&nbuf, "%s%s%s", + *bufp, res, cp) + 1; - strlcpy(nbuf, *bufp, (size_t)(stesc - *bufp + 1)); - strlcat(nbuf, res, *szp); - strlcat(nbuf, cp, *szp); - /* Prepare for the next replacement. */ start = nbuf + pos; - stesc = nbuf + (stesc - *bufp) + ressz; + stesc = nbuf + (stesc - *bufp) + strlen(res); free(*bufp); *bufp = nbuf; } @@ -713,7 +702,7 @@ roff_parsetext(char **bufp, size_t *szp, int pos, int } enum rofferr -roff_parseln(struct roff *r, int ln, char **bufp, +roff_parseln(struct roff *r, int ln, char **bufp, size_t *szp, int pos, int *offs) { enum rofft t; @@ -744,8 +733,7 @@ roff_parseln(struct roff *r, int ln, char **bufp, if (r->last && ! ctl) { t = r->last->tok; assert(roffs[t].text); - e = (*roffs[t].text) - (r, t, bufp, szp, ln, pos, pos, offs); + e = (*roffs[t].text)(r, t, bufp, szp, ln, pos, pos, offs); assert(ROFF_IGN == e || ROFF_CONT == e); if (ROFF_CONT != e) return(e); @@ -767,9 +755,8 @@ roff_parseln(struct roff *r, int ln, char **bufp, if (r->last) { t = r->last->tok; assert(roffs[t].sub); - return((*roffs[t].sub) - (r, t, bufp, szp, - ln, ppos, pos, offs)); + return((*roffs[t].sub)(r, t, bufp, szp, + ln, ppos, pos, offs)); } /* @@ -778,33 +765,30 @@ roff_parseln(struct roff *r, int ln, char **bufp, * the compilers handle it. */ - if (ROFF_MAX == (t = roff_parse(r, *bufp, &pos))) + if (ROFF_MAX == (t = roff_parse(r, *bufp, &pos, ln, ppos))) return(ROFF_CONT); assert(roffs[t].proc); - return((*roffs[t].proc) - (r, t, bufp, szp, - ln, ppos, pos, offs)); + return((*roffs[t].proc)(r, t, bufp, szp, ln, ppos, pos, offs)); } - void roff_endparse(struct roff *r) { if (r->last) mandoc_msg(MANDOCERR_SCOPEEXIT, r->parse, - r->last->line, r->last->col, NULL); + r->last->line, r->last->col, NULL); if (r->eqn) { - mandoc_msg(MANDOCERR_SCOPEEXIT, r->parse, - r->eqn->eqn.ln, r->eqn->eqn.pos, NULL); + mandoc_msg(MANDOCERR_SCOPEEXIT, r->parse, + r->eqn->eqn.ln, r->eqn->eqn.pos, NULL); eqn_end(&r->eqn); } if (r->tbl) { - mandoc_msg(MANDOCERR_SCOPEEXIT, r->parse, - r->tbl->line, r->tbl->pos, NULL); + mandoc_msg(MANDOCERR_SCOPEEXIT, r->parse, + r->tbl->line, r->tbl->pos, NULL); tbl_end(&r->tbl); } } @@ -814,33 +798,30 @@ roff_endparse(struct roff *r) * form of ".foo xxx" in the usual way. */ static enum rofft -roff_parse(struct roff *r, const char *buf, int *pos) +roff_parse(struct roff *r, char *buf, int *pos, int ln, int ppos) { + char *cp; const char *mac; size_t maclen; enum rofft t; - if ('\0' == buf[*pos] || '"' == buf[*pos] || - '\t' == buf[*pos] || ' ' == buf[*pos]) + cp = buf + *pos; + + if ('\0' == *cp || '"' == *cp || '\t' == *cp || ' ' == *cp) return(ROFF_MAX); - /* We stop the macro parse at an escape, tab, space, or nil. */ + mac = cp; + maclen = roff_getname(r, &cp, ln, ppos); - mac = buf + *pos; - maclen = strcspn(mac, " \\\t\0"); - t = (r->current_string = roff_getstrn(r, mac, maclen)) ? ROFF_USERDEF : roffhash_find(mac, maclen); - *pos += (int)maclen; + if (ROFF_MAX != t) + *pos = cp - buf; - while (buf[*pos] && ' ' == buf[*pos]) - (*pos)++; - return(t); } -/* ARGSUSED */ static enum rofferr roff_cblock(ROFF_ARGS) { @@ -856,18 +837,18 @@ roff_cblock(ROFF_ARGS) } switch (r->last->tok) { - case (ROFF_am): + case ROFF_am: /* FALLTHROUGH */ - case (ROFF_ami): + case ROFF_ami: /* FALLTHROUGH */ - case (ROFF_am1): + case ROFF_am1: /* FALLTHROUGH */ - case (ROFF_de): + case ROFF_de: /* ROFF_de1 is remapped to ROFF_de in roff_block(). */ /* FALLTHROUGH */ - case (ROFF_dei): + case ROFF_dei: /* FALLTHROUGH */ - case (ROFF_ig): + case ROFF_ig: break; default: mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL); @@ -875,7 +856,8 @@ roff_cblock(ROFF_ARGS) } if ((*bufp)[pos]) - mandoc_msg(MANDOCERR_ARGSLOST, r->parse, ln, pos, NULL); + mandoc_vmsg(MANDOCERR_ARG_SKIP, r->parse, ln, pos, + ".. %s", *bufp + pos); roffnode_pop(r); roffnode_cleanscope(r); @@ -883,7 +865,6 @@ roff_cblock(ROFF_ARGS) } - static void roffnode_cleanscope(struct roff *r) { @@ -895,7 +876,6 @@ roffnode_cleanscope(struct roff *r) } } - static void roff_ccond(struct roff *r, int ln, int ppos) { @@ -906,11 +886,11 @@ roff_ccond(struct roff *r, int ln, int ppos) } switch (r->last->tok) { - case (ROFF_el): + case ROFF_el: /* FALLTHROUGH */ - case (ROFF_ie): + case ROFF_ie: /* FALLTHROUGH */ - case (ROFF_if): + case ROFF_if: break; default: mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL); @@ -927,20 +907,19 @@ roff_ccond(struct roff *r, int ln, int ppos) return; } - -/* ARGSUSED */ static enum rofferr roff_block(ROFF_ARGS) { - int sv; - size_t sz; - char *name; + char *name, *cp; + size_t namesz; - name = NULL; + name = cp = *bufp + pos; + namesz = 0; if (ROFF_ig != tok) { - if ('\0' == (*bufp)[pos]) { - mandoc_msg(MANDOCERR_NOARGS, r->parse, ln, ppos, NULL); + if ('\0' == *cp) { + mandoc_msg(MANDOCERR_REQ_EMPTY, r->parse, + ln, ppos, roffs[tok].name); return(ROFF_IGN); } @@ -951,19 +930,15 @@ roff_block(ROFF_ARGS) if (ROFF_de1 == tok) tok = ROFF_de; - if (ROFF_de == tok) - name = *bufp + pos; - else + else if (ROFF_de != tok) mandoc_msg(MANDOCERR_REQUEST, r->parse, ln, ppos, roffs[tok].name); - while ((*bufp)[pos] && ! isspace((unsigned char)(*bufp)[pos])) - pos++; + namesz = roff_getname(r, &cp, ln, ppos); + name[namesz] = '\0'; + } else + name = NULL; - while (isspace((unsigned char)(*bufp)[pos])) - (*bufp)[pos++] = '\0'; - } - roffnode_push(r, tok, name, ln, ppos); /* @@ -972,43 +947,26 @@ roff_block(ROFF_ARGS) * appended from roff_block_text() in multiline mode. */ - if (ROFF_de == tok) - roff_setstr(r, name, "", 0); + if (namesz && ROFF_de == tok) + roff_setstrn(&r->strtab, name, namesz, "", 0, 0); - if ('\0' == (*bufp)[pos]) + if ('\0' == *cp) return(ROFF_IGN); /* If present, process the custom end-of-line marker. */ - sv = pos; - while ((*bufp)[pos] && ! isspace((unsigned char)(*bufp)[pos])) - pos++; + name = cp; + namesz = roff_getname(r, &cp, ln, ppos); + if (namesz) + r->last->end = mandoc_strndup(name, namesz); - /* - * Note: groff does NOT like escape characters in the input. - * Instead of detecting this, we're just going to let it fly and - * to hell with it. - */ + if ('\0' != *cp) + mandoc_vmsg(MANDOCERR_ARG_EXCESS, r->parse, + ln, pos, ".%s ... %s", roffs[tok].name, cp); - assert(pos > sv); - sz = (size_t)(pos - sv); - - if (1 == sz && '.' == (*bufp)[sv]) - return(ROFF_IGN); - - r->last->end = mandoc_malloc(sz + 1); - - memcpy(r->last->end, *bufp + sv, sz); - r->last->end[(int)sz] = '\0'; - - if ((*bufp)[pos]) - mandoc_msg(MANDOCERR_ARGSLOST, r->parse, ln, pos, NULL); - return(ROFF_IGN); } - -/* ARGSUSED */ static enum rofferr roff_block_sub(ROFF_ARGS) { @@ -1029,10 +987,10 @@ roff_block_sub(ROFF_ARGS) if ((*bufp)[i] != r->last->end[j]) break; - if ('\0' == r->last->end[j] && - ('\0' == (*bufp)[i] || - ' ' == (*bufp)[i] || - '\t' == (*bufp)[i])) { + if ('\0' == r->last->end[j] && + ('\0' == (*bufp)[i] || + ' ' == (*bufp)[i] || + '\t' == (*bufp)[i])) { roffnode_pop(r); roffnode_cleanscope(r); @@ -1040,7 +998,7 @@ roff_block_sub(ROFF_ARGS) i++; pos = i; - if (ROFF_MAX != roff_parse(r, *bufp, &pos)) + if (ROFF_MAX != roff_parse(r, *bufp, &pos, ln, ppos)) return(ROFF_RERUN); return(ROFF_IGN); } @@ -1051,7 +1009,7 @@ roff_block_sub(ROFF_ARGS) * pulling it out of the hashtable. */ - t = roff_parse(r, *bufp, &pos); + t = roff_parse(r, *bufp, &pos, ln, ppos); /* * Macros other than block-end are only significant @@ -1064,12 +1022,9 @@ roff_block_sub(ROFF_ARGS) } assert(roffs[t].proc); - return((*roffs[t].proc)(r, t, bufp, szp, - ln, ppos, pos, offs)); + return((*roffs[t].proc)(r, t, bufp, szp, ln, ppos, pos, offs)); } - -/* ARGSUSED */ static enum rofferr roff_block_text(ROFF_ARGS) { @@ -1080,8 +1035,6 @@ roff_block_text(ROFF_ARGS) return(ROFF_IGN); } - -/* ARGSUSED */ static enum rofferr roff_cond_sub(ROFF_ARGS) { @@ -1091,7 +1044,7 @@ roff_cond_sub(ROFF_ARGS) rr = r->last->rule; roffnode_cleanscope(r); - t = roff_parse(r, *bufp, &pos); + t = roff_parse(r, *bufp, &pos, ln, ppos); /* * Fully handle known macros when they are structurally @@ -1102,7 +1055,7 @@ roff_cond_sub(ROFF_ARGS) (rr || ROFFMAC_STRUCT & roffs[t].flags)) { assert(roffs[t].proc); return((*roffs[t].proc)(r, t, bufp, szp, - ln, ppos, pos, offs)); + ln, ppos, pos, offs)); } /* @@ -1126,7 +1079,6 @@ roff_cond_sub(ROFF_ARGS) return(rr ? ROFF_CONT : ROFF_IGN); } -/* ARGSUSED */ static enum rofferr roff_cond_text(ROFF_ARGS) { @@ -1237,20 +1189,20 @@ roff_evalcond(const char *v, int *pos) wanttrue = 1; switch (v[*pos]) { - case ('n'): + case 'n': /* FALLTHROUGH */ - case ('o'): + case 'o': (*pos)++; return(wanttrue); - case ('c'): + case 'c': /* FALLTHROUGH */ - case ('d'): + case 'd': /* FALLTHROUGH */ - case ('e'): + case 'e': /* FALLTHROUGH */ - case ('r'): + case 'r': /* FALLTHROUGH */ - case ('t'): + case 't': (*pos)++; return(!wanttrue); default: @@ -1263,7 +1215,6 @@ roff_evalcond(const char *v, int *pos) return(roff_evalstrcond(v, pos) == wanttrue); } -/* ARGSUSED */ static enum rofferr roff_line_ignore(ROFF_ARGS) { @@ -1271,24 +1222,23 @@ roff_line_ignore(ROFF_ARGS) return(ROFF_IGN); } -/* ARGSUSED */ static enum rofferr roff_cond(ROFF_ARGS) { roffnode_push(r, tok, NULL, ln, ppos); - /* + /* * An `.el' has no conditional body: it will consume the value * of the current rstack entry set in prior `ie' calls or - * defaults to DENY. + * defaults to DENY. * * If we're not an `el', however, then evaluate the conditional. */ r->last->rule = ROFF_el == tok ? - (r->rstackpos < 0 ? 0 : r->rstack[r->rstackpos--]) : - roff_evalcond(*bufp, &pos); + (r->rstackpos < 0 ? 0 : r->rstack[r->rstackpos--]) : + roff_evalcond(*bufp, &pos); /* * An if-else will put the NEGATION of the current evaluated @@ -1297,8 +1247,8 @@ roff_cond(ROFF_ARGS) if (ROFF_ie == tok) { if (r->rstackpos == RSTACK_MAX - 1) { - mandoc_msg(MANDOCERR_MEM, - r->parse, ln, ppos, NULL); + mandoc_msg(MANDOCERR_MEM, + r->parse, ln, ppos, NULL); return(ROFF_ERR); } r->rstack[++r->rstackpos] = !r->last->rule; @@ -1329,7 +1279,7 @@ roff_cond(ROFF_ARGS) r->last->endspan = -1; pos += 2; goto out; - } + } /* * Anything else following the conditional causes @@ -1338,7 +1288,8 @@ roff_cond(ROFF_ARGS) */ if ('\0' == (*bufp)[pos]) - mandoc_msg(MANDOCERR_NOARGS, r->parse, ln, ppos, NULL); + mandoc_msg(MANDOCERR_COND_EMPTY, r->parse, + ln, ppos, roffs[tok].name); r->last->endspan = 1; @@ -1347,34 +1298,34 @@ out: return(ROFF_RERUN); } - -/* ARGSUSED */ static enum rofferr roff_ds(ROFF_ARGS) { - char *name, *string; + char *string; + const char *name; + size_t namesz; /* - * A symbol is named by the first word following the macro - * invocation up to a space. Its value is anything after the - * name's trailing whitespace and optional double-quote. Thus, - * - * [.ds foo "bar " ] - * - * will have `bar " ' as its value. + * The first word is the name of the string. + * If it is empty or terminated by an escape sequence, + * abort the `ds' request without defining anything. */ - string = *bufp + pos; - name = roff_getname(r, &string, ln, pos); + name = string = *bufp + pos; if ('\0' == *name) return(ROFF_IGN); - /* Read past initial double-quote. */ + namesz = roff_getname(r, &string, ln, pos); + if ('\\' == name[namesz]) + return(ROFF_IGN); + + /* Read past the initial double-quote, if any. */ if ('"' == *string) string++; /* The rest is the value. */ - roff_setstr(r, name, string, ROFF_as == tok); + roff_setstrn(&r->strtab, name, namesz, string, strlen(string), + ROFF_as == tok); return(ROFF_IGN); } @@ -1390,31 +1341,31 @@ roff_getop(const char *v, int *pos, char *res) *res = v[*pos]; switch (*res) { - case ('+'): + case '+': /* FALLTHROUGH */ - case ('-'): + case '-': /* FALLTHROUGH */ - case ('*'): + case '*': /* FALLTHROUGH */ - case ('/'): + case '/': /* FALLTHROUGH */ - case ('%'): + case '%': /* FALLTHROUGH */ - case ('&'): + case '&': /* FALLTHROUGH */ - case (':'): + case ':': break; case '<': switch (v[*pos + 1]) { - case ('='): + case '=': *res = 'l'; (*pos)++; break; - case ('>'): + case '>': *res = '!'; (*pos)++; break; - case ('?'): + case '?': *res = 'i'; (*pos)++; break; @@ -1424,11 +1375,11 @@ roff_getop(const char *v, int *pos, char *res) break; case '>': switch (v[*pos + 1]) { - case ('='): + case '=': *res = 'g'; (*pos)++; break; - case ('?'): + case '?': *res = 'a'; (*pos)++; break; @@ -1522,50 +1473,50 @@ roff_evalnum(const char *v, int *pos, int *res, int sk continue; switch (operator) { - case ('+'): + case '+': *res += operand2; break; - case ('-'): + case '-': *res -= operand2; break; - case ('*'): + case '*': *res *= operand2; break; - case ('/'): + case '/': *res /= operand2; break; - case ('%'): + case '%': *res %= operand2; break; - case ('<'): + case '<': *res = *res < operand2; break; - case ('>'): + case '>': *res = *res > operand2; break; - case ('l'): + case 'l': *res = *res <= operand2; break; - case ('g'): + case 'g': *res = *res >= operand2; break; - case ('='): + case '=': *res = *res == operand2; break; - case ('!'): + case '!': *res = *res != operand2; break; - case ('&'): + case '&': *res = *res && operand2; break; - case (':'): + case ':': *res = *res || operand2; break; - case ('i'): + case 'i': if (operand2 < *res) *res = operand2; break; - case ('a'): + case 'a': if (operand2 > *res) *res = operand2; break; @@ -1616,17 +1567,17 @@ roff_getregro(const char *name) { switch (*name) { - case ('A'): /* ASCII approximation mode is always off. */ + case 'A': /* ASCII approximation mode is always off. */ return(0); - case ('g'): /* Groff compatibility mode is always on. */ + case 'g': /* Groff compatibility mode is always on. */ return(1); - case ('H'): /* Fixed horizontal resolution. */ + case 'H': /* Fixed horizontal resolution. */ return (24); - case ('j'): /* Always adjust left margin only. */ + case 'j': /* Always adjust left margin only. */ return(0); - case ('T'): /* Some output device is always defined. */ + case 'T': /* Some output device is always defined. */ return(1); - case ('V'): /* Fixed vertical resolution. */ + case 'V': /* Fixed vertical resolution. */ return (40); default: return (-1); @@ -1688,14 +1639,20 @@ roff_freereg(struct roffreg *reg) static enum rofferr roff_nr(ROFF_ARGS) { - const char *key; - char *val; + char *key, *val; + size_t keysz; int iv; char sign; - val = *bufp + pos; - key = roff_getname(r, &val, ln, pos); + key = val = *bufp + pos; + if ('\0' == *key) + return(ROFF_IGN); + keysz = roff_getname(r, &val, ln, pos); + if ('\\' == key[keysz]) + return(ROFF_IGN); + key[keysz] = '\0'; + sign = *val; if ('+' == sign || '-' == sign) val++; @@ -1710,11 +1667,14 @@ static enum rofferr roff_rr(ROFF_ARGS) { struct roffreg *reg, **prev; - const char *name; - char *cp; + char *name, *cp; + size_t namesz; - cp = *bufp + pos; - name = roff_getname(r, &cp, ln, pos); + name = cp = *bufp + pos; + if ('\0' == *name) + return(ROFF_IGN); + namesz = roff_getname(r, &cp, ln, pos); + name[namesz] = '\0'; prev = &r->regtab; while (1) { @@ -1731,23 +1691,24 @@ roff_rr(ROFF_ARGS) return(ROFF_IGN); } -/* ARGSUSED */ static enum rofferr roff_rm(ROFF_ARGS) { const char *name; char *cp; + size_t namesz; cp = *bufp + pos; while ('\0' != *cp) { - name = roff_getname(r, &cp, ln, (int)(cp - *bufp)); - if ('\0' != *name) - roff_setstr(r, name, NULL, 0); + name = cp; + namesz = roff_getname(r, &cp, ln, (int)(cp - *bufp)); + roff_setstrn(&r->strtab, name, namesz, NULL, 0, 0); + if ('\\' == name[namesz]) + break; } return(ROFF_IGN); } -/* ARGSUSED */ static enum rofferr roff_it(ROFF_ARGS) { @@ -1761,7 +1722,7 @@ roff_it(ROFF_ARGS) cp[len] = '\0'; if ((iv = mandoc_strntoi(cp, len, 10)) <= 0) { mandoc_msg(MANDOCERR_NUMERIC, r->parse, - ln, ppos, *bufp + 1); + ln, ppos, *bufp + 1); return(ROFF_IGN); } cp += len + 1; @@ -1772,7 +1733,6 @@ roff_it(ROFF_ARGS) return(ROFF_IGN); } -/* ARGSUSED */ static enum rofferr roff_Dd(ROFF_ARGS) { @@ -1785,7 +1745,6 @@ roff_Dd(ROFF_ARGS) return(ROFF_CONT); } -/* ARGSUSED */ static enum rofferr roff_TH(ROFF_ARGS) { @@ -1798,7 +1757,6 @@ roff_TH(ROFF_ARGS) return(ROFF_CONT); } -/* ARGSUSED */ static enum rofferr roff_TE(ROFF_ARGS) { @@ -1811,7 +1769,6 @@ roff_TE(ROFF_ARGS) return(ROFF_IGN); } -/* ARGSUSED */ static enum rofferr roff_T_(ROFF_ARGS) { @@ -1834,7 +1791,7 @@ roff_closeeqn(struct roff *r) #endif static void -roff_openeqn(struct roff *r, const char *name, int line, +roff_openeqn(struct roff *r, const char *name, int line, int offs, const char *buf) { struct eqn_node *e; @@ -1856,7 +1813,6 @@ roff_openeqn(struct roff *r, const char *name, int lin } } -/* ARGSUSED */ static enum rofferr roff_EQ(ROFF_ARGS) { @@ -1865,7 +1821,6 @@ roff_EQ(ROFF_ARGS) return(ROFF_IGN); } -/* ARGSUSED */ static enum rofferr roff_EN(ROFF_ARGS) { @@ -1874,7 +1829,6 @@ roff_EN(ROFF_ARGS) return(ROFF_IGN); } -/* ARGSUSED */ static enum rofferr roff_TS(ROFF_ARGS) { @@ -1896,7 +1850,6 @@ roff_TS(ROFF_ARGS) return(ROFF_IGN); } -/* ARGSUSED */ static enum rofferr roff_cc(ROFF_ARGS) { @@ -1913,7 +1866,6 @@ roff_cc(ROFF_ARGS) return(ROFF_IGN); } -/* ARGSUSED */ static enum rofferr roff_tr(ROFF_ARGS) { @@ -1935,9 +1887,9 @@ roff_tr(ROFF_ARGS) if ('\\' == *first) { esc = mandoc_escape(&p, NULL, NULL); if (ESCAPE_ERROR == esc) { - mandoc_msg - (MANDOCERR_BADESCAPE, r->parse, - ln, (int)(p - *bufp), NULL); + mandoc_msg(MANDOCERR_BADESCAPE, + r->parse, ln, + (int)(p - *bufp), NULL); return(ROFF_IGN); } fsz = (size_t)(p - first); @@ -1947,28 +1899,28 @@ roff_tr(ROFF_ARGS) if ('\\' == *second) { esc = mandoc_escape(&p, NULL, NULL); if (ESCAPE_ERROR == esc) { - mandoc_msg - (MANDOCERR_BADESCAPE, r->parse, - ln, (int)(p - *bufp), NULL); + mandoc_msg(MANDOCERR_BADESCAPE, + r->parse, ln, + (int)(p - *bufp), NULL); return(ROFF_IGN); } ssz = (size_t)(p - second); } else if ('\0' == *second) { - mandoc_msg(MANDOCERR_ARGCOUNT, r->parse, - ln, (int)(p - *bufp), NULL); + mandoc_msg(MANDOCERR_ARGCOUNT, r->parse, + ln, (int)(p - *bufp), NULL); second = " "; p--; } if (fsz > 1) { - roff_setstrn(&r->xmbtab, first, - fsz, second, ssz, 0); + roff_setstrn(&r->xmbtab, first, fsz, + second, ssz, 0); continue; } if (NULL == r->xtab) - r->xtab = mandoc_calloc - (128, sizeof(struct roffstr)); + r->xtab = mandoc_calloc(128, + sizeof(struct roffstr)); free(r->xtab[(int)*first].p); r->xtab[(int)*first].p = mandoc_strndup(second, ssz); @@ -1978,13 +1930,13 @@ roff_tr(ROFF_ARGS) return(ROFF_IGN); } -/* ARGSUSED */ static enum rofferr roff_so(ROFF_ARGS) { char *name; - mandoc_msg(MANDOCERR_SO, r->parse, ln, ppos, NULL); + name = *bufp + pos; + mandoc_vmsg(MANDOCERR_SO, r->parse, ln, ppos, ".so %s", name); /* * Handle `so'. Be EXTREMELY careful, as we shouldn't be @@ -1993,9 +1945,9 @@ roff_so(ROFF_ARGS) * or using absolute paths. */ - name = *bufp + pos; if ('/' == *name || strstr(name, "../") || strstr(name, "/..")) { - mandoc_msg(MANDOCERR_SOPATH, r->parse, ln, pos, NULL); + mandoc_vmsg(MANDOCERR_SO_PATH, r->parse, ln, ppos, + ".so %s", name); return(ROFF_ERR); } @@ -2003,7 +1955,6 @@ roff_so(ROFF_ARGS) return(ROFF_SO); } -/* ARGSUSED */ static enum rofferr roff_userdef(ROFF_ARGS) { @@ -2032,14 +1983,9 @@ roff_userdef(ROFF_ARGS) cp += 2; continue; } - - *szp = strlen(n1) - 3 + strlen(arg[i]) + 1; - n2 = mandoc_malloc(*szp); - - strlcpy(n2, n1, (size_t)(cp - n1 + 1)); - strlcat(n2, arg[i], *szp); - strlcat(n2, cp + 3, *szp); - + *cp = '\0'; + *szp = mandoc_asprintf(&n2, "%s%s%s", + n1, arg[i], cp + 3) + 1; cp = n2 + (cp - n1); free(n1); n1 = n2; @@ -2058,37 +2004,41 @@ roff_userdef(ROFF_ARGS) ROFF_REPARSE : ROFF_APPEND); } -static char * +static size_t roff_getname(struct roff *r, char **cpp, int ln, int pos) { char *name, *cp; + size_t namesz; name = *cpp; if ('\0' == *name) - return(name); + return(0); - /* Read until end of name. */ - for (cp = name; '\0' != *cp && ' ' != *cp; cp++) { + /* Read until end of name and terminate it with NUL. */ + for (cp = name; 1; cp++) { + if ('\0' == *cp || ' ' == *cp) { + namesz = cp - name; + break; + } if ('\\' != *cp) continue; + namesz = cp - name; + if ('{' == cp[1] || '}' == cp[1]) + break; cp++; if ('\\' == *cp) continue; mandoc_msg(MANDOCERR_NAMESC, r->parse, ln, pos, NULL); - *cp = '\0'; - name = cp; + mandoc_escape((const char **)&cp, NULL, NULL); + break; } - /* Nil-terminate name. */ - if ('\0' != *cp) - *(cp++) = '\0'; - /* Read past spaces. */ while (' ' == *cp) cp++; *cpp = cp; - return(name); + return(namesz); } /* @@ -2104,7 +2054,7 @@ roff_setstr(struct roff *r, const char *name, const ch { roff_setstrn(&r->strtab, name, strlen(name), string, - string ? strlen(string) : 0, append); + string ? strlen(string) : 0, append); } static void @@ -2119,7 +2069,8 @@ roff_setstrn(struct roffkv **r, const char *name, size /* Search for an existing string with the same name. */ n = *r; - while (n && strcmp(name, n->key.p)) + while (n && (namesz != n->key.sz || + strncmp(n->key.p, name, namesz))) n = n->next; if (NULL == n) { @@ -2185,8 +2136,8 @@ roff_getstrn(const struct roff *r, const char *name, s int i; for (n = r->strtab; n; n = n->next) - if (0 == strncmp(name, n->key.p, len) && - '\0' == n->key.p[(int)len]) + if (0 == strncmp(name, n->key.p, len) && + '\0' == n->key.p[(int)len]) return(n->val.p); for (i = 0; i < PREDEFS_MAX; i++) @@ -2213,14 +2164,14 @@ roff_freestr(struct roffkv *r) const struct tbl_span * roff_span(const struct roff *r) { - + return(r->tbl ? tbl_span(r->tbl) : NULL); } const struct eqn * roff_eqn(const struct roff *r) { - + return(r->last_eqn ? &r->last_eqn->eqn : NULL); } @@ -2279,8 +2230,8 @@ roff_strdup(const struct roff *r, const char *p) * Append the match to the array and move * forward by its keysize. */ - res = mandoc_realloc - (res, ssz + cp->val.sz + 1); + res = mandoc_realloc(res, + ssz + cp->val.sz + 1); memcpy(res + ssz, cp->val.p, cp->val.sz); ssz += cp->val.sz; p += (int)cp->key.sz; @@ -2301,8 +2252,8 @@ roff_strdup(const struct roff *r, const char *p) memcpy(res + ssz, pp, sz); break; } - /* - * We bail out on bad escapes. + /* + * We bail out on bad escapes. * No need to warn: we already did so when * roff_res() was called. */ @@ -2317,7 +2268,7 @@ roff_strdup(const struct roff *r, const char *p) } /* - * Find out whether a line is a macro line or not. + * Find out whether a line is a macro line or not. * If it is, adjust the current position and return one; if it isn't, * return zero and don't change the current position. * If the control character has been set with `.cc', then let that grain