Bugfix in roff_setstrn():

[mandoc.git] / roff.c

diff --git a/roff.c b/roff.c
index 2adafc18585b5cbcf623690d47cadde85869d853..30e923098edf90b9cf067b56a2690f2d8a8554d0 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,4 +1,4 @@
-/*     $Id: roff.c,v 1.205 2014/04/07 21:00:08 schwarze Exp $ */
+/*     $Id: roff.c,v 1.211 2014/06/29 21:20:31 schwarze Exp $ */

 /*
  * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>


@@ -137,7 +137,7 @@ struct      roffnode {
 
 #define        ROFF_ARGS        struct roff *r, /* parse ctx */ \
                         enum rofft tok, /* tok of macro */ \
 
 #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 */ \
                         size_t *szp, /* size of input buffer */ \
                         int ln, /* parse line */ \
                         int ppos, /* original pos in buffer */ \


@@ -193,7 +193,7 @@ 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 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);
                                const char *, size_t);
 static enum rofferr     roff_it(ROFF_ARGS);
 static enum rofferr     roff_line_ignore(ROFF_ARGS);


@@ -202,13 +202,13 @@ static    void             roff_openeqn(struct roff *, const char *,
                                int, int, const char *);
 static enum rofft       roff_parse(struct roff *, const char *, int *);
 static enum rofferr     roff_parsetext(char **, size_t *, int, int *);
                                int, int, const char *);
 static enum rofft       roff_parse(struct roff *, const char *, 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);
                                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);
                                size_t, const char *, size_t, int);
 static enum rofferr     roff_so(ROFF_ARGS);
 static enum rofferr     roff_tr(ROFF_ARGS);


@@ -315,6 +315,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 int      roffit_lines;  /* number of lines to delay */
 static char    *roffit_macro;  /* nil-terminated macro line */
 

+

 static void
 roffhash_init(void)
 {
 static void
 roffhash_init(void)
 {


@@ -367,7 +368,6 @@ roffhash_find(const char *p, size_t s)
        return(ROFF_MAX);
 }
 
        return(ROFF_MAX);
 }
 

-

 /*
  * Pop the current node off of the stack of roff instructions currently
  * pending.
 /*
  * Pop the current node off of the stack of roff instructions currently
  * pending.


@@ -378,7 +378,7 @@ roffnode_pop(struct roff *r)
        struct roffnode *p;
 
        assert(r->last);
        struct roffnode *p;
 
        assert(r->last);

-       p = r->last; 
+       p = r->last;

 
        r->last = r->last->parent;
        free(p->name);
 
        r->last = r->last->parent;
        free(p->name);


@@ -386,7 +386,6 @@ roffnode_pop(struct roff *r)
        free(p);
 }
 
        free(p);
 }
 

-

 /*
  * Push a roff node onto the instruction stack.  This must later be
  * removed with roffnode_pop().
 /*
  * Push a roff node onto the instruction stack.  This must later be
  * removed with roffnode_pop().


@@ -409,7 +408,6 @@ roffnode_push(struct roff *r, enum rofft tok, const char *name,
        r->last = p;
 }
 
        r->last = p;
 }
 

-

 static void
 roff_free1(struct roff *r)
 {
 static void
 roff_free1(struct roff *r)
 {


@@ -459,7 +457,6 @@ roff_reset(struct roff *r)
        r->control = 0;
 }
 
        r->control = 0;
 }
 

-

 void
 roff_free(struct roff *r)
 {
 void
 roff_free(struct roff *r)
 {


@@ -468,7 +465,6 @@ roff_free(struct roff *r)
        free(r);
 }
 
        free(r);
 }
 

-

 struct roff *
 roff_alloc(struct mparse *parse, int options)
 {
 struct roff *
 roff_alloc(struct mparse *parse, int options)
 {


@@ -478,31 +474,33 @@ roff_alloc(struct mparse *parse, int options)
        r->parse = parse;
        r->options = options;
        r->rstackpos = -1;
        r->parse = parse;
        r->options = options;
        r->rstackpos = -1;

-       
+

        roffhash_init();
 
        return(r);
 }
 
 /*
        roffhash_init();
 
        return(r);
 }
 
 /*

- * In the current line, expand user-defined strings ("\*")
- * and references to number registers ("\n").
- * Also check the syntax of other escape sequences.
+ * In the current line, expand escape sequences that tend to get
+ * used in numerical expressions and conditional requests.
+ * Also check the syntax of the remaining escape sequences.

  */
 static enum rofferr
 roff_res(struct roff *r, char **bufp, size_t *szp, int ln, int pos)
 {
  */
 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      *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 */
        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              expand_count;  /* to avoid infinite loops */

+       int              npos;  /* position in numeric expression */
+       int              irc;   /* return code from roff_evalnum() */
+       char             term;  /* character terminating the escape */

 
        expand_count = 0;
        start = *bufp + pos;
 
        expand_count = 0;
        start = *bufp + pos;


@@ -521,21 +519,24 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int ln, int pos)
                                break;
 
                if (0 == (stesc - cp) % 2) {
                                break;
 
                if (0 == (stesc - cp) % 2) {

-                       stesc = cp;
+                       stesc = (char *)cp;

                        continue;
                }
 
                        continue;
                }
 

-               /*
-                * Everything except user-defined strings and number
-                * registers is only checked, not expanded.
-                */
+               /* Decide whether to expand or to check only. */

 
 

+               term = '\0';

                cp = stesc + 1;
                switch (*cp) {
                cp = stesc + 1;
                switch (*cp) {

-               case ('*'):
+               case '*':

                        res = NULL;
                        break;
                        res = NULL;
                        break;

-               case ('n'):
+               case 'B':
+                       /* FALLTHROUGH */
+               case 'w':
+                       term = cp[1];
+                       /* FALLTHROUGH */
+               case 'n':

                        res = ubuf;
                        break;
                default:
                        res = ubuf;
                        break;
                default:


@@ -557,20 +558,27 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int ln, int pos)
                 * Save a pointer to the name.
                 */
 
                 * Save a pointer to the name.
                 */
 

-               switch (*++cp) {
-               case ('\0'):
-                       continue;
-               case ('('):
-                       cp++;
-                       maxl = 2;
-                       break;
-               case ('['):
-                       cp++;
+               if ('\0' == term) {
+                       switch (*++cp) {
+                       case '\0':
+                               maxl = 0;
+                               break;
+                       case '(':
+                               cp++;
+                               maxl = 2;
+                               break;
+                       case '[':
+                               cp++;
+                               term = ']';
+                               maxl = 0;
+                               break;
+                       default:
+                               maxl = 1;
+                               break;
+                       }
+               } else {
+                       cp += 2;

                        maxl = 0;
                        maxl = 0;

-                       break;
-               default:
-                       maxl = 1;
-                       break;

                }
                stnam = cp;
 
                }
                stnam = cp;
 


@@ -578,14 +586,14 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int ln, int pos)
 
                for (naml = 0; 0 == maxl || naml < maxl; naml++, cp++) {
                        if ('\0' == *cp) {
 
                for (naml = 0; 0 == maxl || naml < maxl; naml++, cp++) {
                        if ('\0' == *cp) {

-                               mandoc_msg
-                                       (MANDOCERR_BADESCAPE, 
-                                        r->parse, ln, 
-                                        (int)(stesc - *bufp), NULL);
-                               continue;
+                               mandoc_msg(MANDOCERR_BADESCAPE, r->parse,
+                                   ln, (int)(stesc - *bufp), NULL);
+                               break;

                        }
                        }

-                       if (0 == maxl && ']' == *cp)
+                       if (0 == maxl && *cp == term) {
+                               cp++;

                                break;
                                break;

+                       }

                }
 
                /*
                }
 
                /*


@@ -593,33 +601,43 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int ln, int pos)
                 * undefined, resume searching for escapes.
                 */
 
                 * undefined, resume searching for escapes.
                 */
 

-               if (NULL == res)
+               switch (stesc[1]) {
+               case '*':

                        res = roff_getstrn(r, stnam, naml);
                        res = roff_getstrn(r, stnam, naml);

-               else
-                       snprintf(ubuf, sizeof(ubuf), "%d",
+                       break;
+               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':
+                       (void)snprintf(ubuf, sizeof(ubuf), "%d",

                            roff_getregn(r, stnam, naml));
                            roff_getregn(r, stnam, naml));

+                       break;
+               case 'w':
+                       (void)snprintf(ubuf, sizeof(ubuf), "%d",
+                           24 * (int)naml);
+                       break;
+               }

 
                if (NULL == res) {
 
                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 = "";
                }
                        res = "";
                }

-               ressz = strlen(res);

 
                /* Replace the escape sequence by the string. */
 
 
                /* Replace the escape sequence by the string. */
 

-               *szp += ressz + 1;
-               nbuf = mandoc_malloc(*szp);
-
-               strlcpy(nbuf, *bufp, (size_t)(stesc - *bufp + 1));
-               strlcat(nbuf, res, *szp);
-               strlcat(nbuf, cp + (maxl ? 0 : 1), *szp);
+               *stesc = '\0';
+               *szp = mandoc_asprintf(&nbuf, "%s%s%s",
+                   *bufp, res, cp) + 1;

 
                /* Prepare for the next replacement. */
 
                start = nbuf + pos;
 
                /* Prepare for the next replacement. */
 
                start = nbuf + pos;

-               stesc = nbuf + (stesc - *bufp) + ressz;
+               stesc = nbuf + (stesc - *bufp) + strlen(res);

                free(*bufp);
                *bufp = nbuf;
        }
                free(*bufp);
                *bufp = nbuf;
        }


@@ -683,7 +701,7 @@ roff_parsetext(char **bufp, size_t *szp, int pos, int *offs)
 }
 
 enum rofferr
 }
 
 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;
                size_t *szp, int pos, int *offs)
 {
        enum rofft       t;


@@ -714,8 +732,7 @@ roff_parseln(struct roff *r, int ln, char **bufp,
        if (r->last && ! ctl) {
                t = r->last->tok;
                assert(roffs[t].text);
        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);
                assert(ROFF_IGN == e || ROFF_CONT == e);
                if (ROFF_CONT != e)
                        return(e);


@@ -737,9 +754,8 @@ roff_parseln(struct roff *r, int ln, char **bufp,
        if (r->last) {
                t = r->last->tok;
                assert(roffs[t].sub);
        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));

        }
 
        /*
        }
 
        /*


@@ -752,29 +768,26 @@ roff_parseln(struct roff *r, int ln, char **bufp,
                return(ROFF_CONT);
 
        assert(roffs[t].proc);
                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,
 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) {
 
        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) {
                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);
        }
 }
                tbl_end(&r->tbl);
        }
 }


@@ -790,8 +803,8 @@ roff_parse(struct roff *r, const char *buf, int *pos)
        size_t           maclen;
        enum rofft       t;
 
        size_t           maclen;
        enum rofft       t;
 

-       if ('\0' == buf[*pos] || '"' == buf[*pos] || 
-                       '\t' == buf[*pos] || ' ' == buf[*pos])
+       if ('\0' == buf[*pos] || '"' == buf[*pos] ||
+           '\t' == buf[*pos] || ' ' == buf[*pos])

                return(ROFF_MAX);
 
        /* We stop the macro parse at an escape, tab, space, or nil. */
                return(ROFF_MAX);
 
        /* We stop the macro parse at an escape, tab, space, or nil. */


@@ -810,7 +823,6 @@ roff_parse(struct roff *r, const char *buf, int *pos)
        return(t);
 }
 
        return(t);
 }
 

-/* ARGSUSED */

 static enum rofferr
 roff_cblock(ROFF_ARGS)
 {
 static enum rofferr
 roff_cblock(ROFF_ARGS)
 {


@@ -826,18 +838,18 @@ roff_cblock(ROFF_ARGS)
        }
 
        switch (r->last->tok) {
        }
 
        switch (r->last->tok) {

-       case (ROFF_am):
+       case ROFF_am:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (ROFF_ami):
+       case ROFF_ami:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (ROFF_am1):
+       case ROFF_am1:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (ROFF_de):
+       case ROFF_de:

                /* ROFF_de1 is remapped to ROFF_de in roff_block(). */
                /* FALLTHROUGH */
                /* ROFF_de1 is remapped to ROFF_de in roff_block(). */
                /* FALLTHROUGH */

-       case (ROFF_dei):
+       case ROFF_dei:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (ROFF_ig):
+       case ROFF_ig:

                break;
        default:
                mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
                break;
        default:
                mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);


@@ -853,7 +865,6 @@ roff_cblock(ROFF_ARGS)
 
 }
 
 
 }
 

-

 static void
 roffnode_cleanscope(struct roff *r)
 {
 static void
 roffnode_cleanscope(struct roff *r)
 {


@@ -865,7 +876,6 @@ roffnode_cleanscope(struct roff *r)
        }
 }
 
        }
 }
 

-

 static void
 roff_ccond(struct roff *r, int ln, int ppos)
 {
 static void
 roff_ccond(struct roff *r, int ln, int ppos)
 {


@@ -876,11 +886,11 @@ roff_ccond(struct roff *r, int ln, int ppos)
        }
 
        switch (r->last->tok) {
        }
 
        switch (r->last->tok) {

-       case (ROFF_el):
+       case ROFF_el:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (ROFF_ie):
+       case ROFF_ie:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (ROFF_if):
+       case ROFF_if:

                break;
        default:
                mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
                break;
        default:
                mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);


@@ -897,8 +907,6 @@ roff_ccond(struct roff *r, int ln, int ppos)
        return;
 }
 
        return;
 }
 

-
-/* ARGSUSED */

 static enum rofferr
 roff_block(ROFF_ARGS)
 {
 static enum rofferr
 roff_block(ROFF_ARGS)
 {


@@ -977,8 +985,6 @@ roff_block(ROFF_ARGS)
        return(ROFF_IGN);
 }
 
        return(ROFF_IGN);
 }
 

-
-/* ARGSUSED */

 static enum rofferr
 roff_block_sub(ROFF_ARGS)
 {
 static enum rofferr
 roff_block_sub(ROFF_ARGS)
 {


@@ -999,10 +1005,10 @@ roff_block_sub(ROFF_ARGS)
                        if ((*bufp)[i] != r->last->end[j])
                                break;
 
                        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);
 
                        roffnode_pop(r);
                        roffnode_cleanscope(r);
 


@@ -1034,12 +1040,9 @@ roff_block_sub(ROFF_ARGS)
        }
 
        assert(roffs[t].proc);
        }
 
        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)
 {
 static enum rofferr
 roff_block_text(ROFF_ARGS)
 {


@@ -1050,8 +1053,6 @@ roff_block_text(ROFF_ARGS)
        return(ROFF_IGN);
 }
 
        return(ROFF_IGN);
 }
 

-
-/* ARGSUSED */

 static enum rofferr
 roff_cond_sub(ROFF_ARGS)
 {
 static enum rofferr
 roff_cond_sub(ROFF_ARGS)
 {


@@ -1072,7 +1073,7 @@ roff_cond_sub(ROFF_ARGS)
            (rr || ROFFMAC_STRUCT & roffs[t].flags)) {
                assert(roffs[t].proc);
                return((*roffs[t].proc)(r, t, bufp, szp,
            (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));

        }
 
        /*
        }
 
        /*


@@ -1096,7 +1097,6 @@ roff_cond_sub(ROFF_ARGS)
        return(rr ? ROFF_CONT : ROFF_IGN);
 }
 
        return(rr ? ROFF_CONT : ROFF_IGN);
 }
 

-/* ARGSUSED */

 static enum rofferr
 roff_cond_text(ROFF_ARGS)
 {
 static enum rofferr
 roff_cond_text(ROFF_ARGS)
 {


@@ -1126,7 +1126,10 @@ roff_cond_text(ROFF_ARGS)
 static int
 roff_getnum(const char *v, int *pos, int *res)
 {
 static int
 roff_getnum(const char *v, int *pos, int *res)
 {

-       int p, n;
+       int      myres, n, p;
+
+       if (NULL == res)
+               res = &myres;

 
        p = *pos;
        n = v[p] == '-';
 
        p = *pos;
        n = v[p] == '-';


@@ -1204,20 +1207,20 @@ roff_evalcond(const char *v, int *pos)
                wanttrue = 1;
 
        switch (v[*pos]) {
                wanttrue = 1;
 
        switch (v[*pos]) {

-       case ('n'):
+       case 'n':

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('o'):
+       case 'o':

                (*pos)++;
                return(wanttrue);
                (*pos)++;
                return(wanttrue);

-       case ('c'):
+       case 'c':

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('d'):
+       case 'd':

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('e'):
+       case 'e':

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('r'):
+       case 'r':

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('t'):
+       case 't':

                (*pos)++;
                return(!wanttrue);
        default:
                (*pos)++;
                return(!wanttrue);
        default:


@@ -1230,7 +1233,6 @@ roff_evalcond(const char *v, int *pos)
                return(roff_evalstrcond(v, pos) == wanttrue);
 }
 
                return(roff_evalstrcond(v, pos) == wanttrue);
 }
 

-/* ARGSUSED */

 static enum rofferr
 roff_line_ignore(ROFF_ARGS)
 {
 static enum rofferr
 roff_line_ignore(ROFF_ARGS)
 {


@@ -1238,24 +1240,23 @@ roff_line_ignore(ROFF_ARGS)
        return(ROFF_IGN);
 }
 
        return(ROFF_IGN);
 }
 

-/* ARGSUSED */

 static enum rofferr
 roff_cond(ROFF_ARGS)
 {
 
        roffnode_push(r, tok, NULL, ln, ppos);
 
 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
         * 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 ?
         *
         * 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
 
        /*
         * An if-else will put the NEGATION of the current evaluated


@@ -1264,8 +1265,8 @@ roff_cond(ROFF_ARGS)
 
        if (ROFF_ie == tok) {
                if (r->rstackpos == RSTACK_MAX - 1) {
 
        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;
                        return(ROFF_ERR);
                }
                r->rstack[++r->rstackpos] = !r->last->rule;


@@ -1296,7 +1297,7 @@ roff_cond(ROFF_ARGS)
                r->last->endspan = -1;
                pos += 2;
                goto out;
                r->last->endspan = -1;
                pos += 2;
                goto out;

-       } 
+       }

 
        /*
         * Anything else following the conditional causes
 
        /*
         * Anything else following the conditional causes


@@ -1314,8 +1315,6 @@ out:
        return(ROFF_RERUN);
 }
 
        return(ROFF_RERUN);
 }
 

-
-/* ARGSUSED */

 static enum rofferr
 roff_ds(ROFF_ARGS)
 {
 static enum rofferr
 roff_ds(ROFF_ARGS)
 {


@@ -1357,31 +1356,31 @@ roff_getop(const char *v, int *pos, char *res)
        *res = v[*pos];
 
        switch (*res) {
        *res = v[*pos];
 
        switch (*res) {

-       case ('+'):
+       case '+':

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('-'):
+       case '-':

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('*'):
+       case '*':

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('/'):
+       case '/':

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('%'):
+       case '%':

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('&'):
+       case '&':

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (':'):
+       case ':':

                break;
        case '<':
                switch (v[*pos + 1]) {
                break;
        case '<':
                switch (v[*pos + 1]) {

-               case ('='):
+               case '=':

                        *res = 'l';
                        (*pos)++;
                        break;
                        *res = 'l';
                        (*pos)++;
                        break;

-               case ('>'):
+               case '>':

                        *res = '!';
                        (*pos)++;
                        break;
                        *res = '!';
                        (*pos)++;
                        break;

-               case ('?'):
+               case '?':

                        *res = 'i';
                        (*pos)++;
                        break;
                        *res = 'i';
                        (*pos)++;
                        break;


@@ -1391,11 +1390,11 @@ roff_getop(const char *v, int *pos, char *res)
                break;
        case '>':
                switch (v[*pos + 1]) {
                break;
        case '>':
                switch (v[*pos + 1]) {

-               case ('='):
+               case '=':

                        *res = 'g';
                        (*pos)++;
                        break;
                        *res = 'g';
                        (*pos)++;
                        break;

-               case ('?'):
+               case '?':

                        *res = 'a';
                        (*pos)++;
                        break;
                        *res = 'a';
                        (*pos)++;
                        break;


@@ -1430,9 +1429,16 @@ roff_evalpar(const char *v, int *pos, int *res)
        if ( ! roff_evalnum(v, pos, res, 1))
                return(0);
 
        if ( ! roff_evalnum(v, pos, res, 1))
                return(0);
 

-       /* If the trailing parenthesis is missing, ignore the error. */
+       /*
+        * Omission of the closing parenthesis
+        * is an error in validation mode,
+        * but ignored in evaluation mode.
+        */
+

        if (')' == v[*pos])
                (*pos)++;
        if (')' == v[*pos])
                (*pos)++;

+       else if (NULL == res)
+               return(0);

 
        return(1);
 }
 
        return(1);
 }


@@ -1478,51 +1484,54 @@ roff_evalnum(const char *v, int *pos, int *res, int skipwhite)
                        while (isspace((unsigned char)v[*pos]))
                                (*pos)++;
 
                        while (isspace((unsigned char)v[*pos]))
                                (*pos)++;
 

+               if (NULL == res)
+                       continue;
+

                switch (operator) {
                switch (operator) {

-               case ('+'):
+               case '+':

                        *res += operand2;
                        break;
                        *res += operand2;
                        break;

-               case ('-'):
+               case '-':

                        *res -= operand2;
                        break;
                        *res -= operand2;
                        break;

-               case ('*'):
+               case '*':

                        *res *= operand2;
                        break;
                        *res *= operand2;
                        break;

-               case ('/'):
+               case '/':

                        *res /= operand2;
                        break;
                        *res /= operand2;
                        break;

-               case ('%'):
+               case '%':

                        *res %= operand2;
                        break;
                        *res %= operand2;
                        break;

-               case ('<'):
+               case '<':

                        *res = *res < operand2;
                        break;
                        *res = *res < operand2;
                        break;

-               case ('>'):
+               case '>':

                        *res = *res > operand2;
                        break;
                        *res = *res > operand2;
                        break;

-               case ('l'):
+               case 'l':

                        *res = *res <= operand2;
                        break;
                        *res = *res <= operand2;
                        break;

-               case ('g'):
+               case 'g':

                        *res = *res >= operand2;
                        break;
                        *res = *res >= operand2;
                        break;

-               case ('='):
+               case '=':

                        *res = *res == operand2;
                        break;
                        *res = *res == operand2;
                        break;

-               case ('!'):
+               case '!':

                        *res = *res != operand2;
                        break;
                        *res = *res != operand2;
                        break;

-               case ('&'):
+               case '&':

                        *res = *res && operand2;
                        break;
                        *res = *res && operand2;
                        break;

-               case (':'):
+               case ':':

                        *res = *res || operand2;
                        break;
                        *res = *res || operand2;
                        break;

-               case ('i'):
+               case 'i':

                        if (operand2 < *res)
                                *res = operand2;
                        break;
                        if (operand2 < *res)
                                *res = operand2;
                        break;

-               case ('a'):
+               case 'a':

                        if (operand2 > *res)
                                *res = operand2;
                        break;
                        if (operand2 > *res)
                                *res = operand2;
                        break;


@@ -1573,17 +1582,17 @@ roff_getregro(const char *name)
 {
 
        switch (*name) {
 {
 
        switch (*name) {

-       case ('A'):  /* ASCII approximation mode is always off. */
+       case 'A':  /* ASCII approximation mode is always off. */

                return(0);
                return(0);

-       case ('g'):  /* Groff compatibility mode is always on. */
+       case 'g':  /* Groff compatibility mode is always on. */

                return(1);
                return(1);

-       case ('H'):  /* Fixed horizontal resolution. */
+       case 'H':  /* Fixed horizontal resolution. */

                return (24);
                return (24);

-       case ('j'):  /* Always adjust left margin only. */
+       case 'j':  /* Always adjust left margin only. */

                return(0);
                return(0);

-       case ('T'):  /* Some output device is always defined. */
+       case 'T':  /* Some output device is always defined. */

                return(1);
                return(1);

-       case ('V'):  /* Fixed vertical resolution. */
+       case 'V':  /* Fixed vertical resolution. */

                return (40);
        default:
                return (-1);
                return (40);
        default:
                return (-1);


@@ -1688,7 +1697,6 @@ roff_rr(ROFF_ARGS)
        return(ROFF_IGN);
 }
 
        return(ROFF_IGN);
 }
 

-/* ARGSUSED */

 static enum rofferr
 roff_rm(ROFF_ARGS)
 {
 static enum rofferr
 roff_rm(ROFF_ARGS)
 {


@@ -1704,7 +1712,6 @@ roff_rm(ROFF_ARGS)
        return(ROFF_IGN);
 }
 
        return(ROFF_IGN);
 }
 

-/* ARGSUSED */

 static enum rofferr
 roff_it(ROFF_ARGS)
 {
 static enum rofferr
 roff_it(ROFF_ARGS)
 {


@@ -1718,7 +1725,7 @@ roff_it(ROFF_ARGS)
        cp[len] = '\0';
        if ((iv = mandoc_strntoi(cp, len, 10)) <= 0) {
                mandoc_msg(MANDOCERR_NUMERIC, r->parse,
        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;
                return(ROFF_IGN);
        }
        cp += len + 1;


@@ -1729,7 +1736,6 @@ roff_it(ROFF_ARGS)
        return(ROFF_IGN);
 }
 
        return(ROFF_IGN);
 }
 

-/* ARGSUSED */

 static enum rofferr
 roff_Dd(ROFF_ARGS)
 {
 static enum rofferr
 roff_Dd(ROFF_ARGS)
 {


@@ -1742,7 +1748,6 @@ roff_Dd(ROFF_ARGS)
        return(ROFF_CONT);
 }
 
        return(ROFF_CONT);
 }
 

-/* ARGSUSED */

 static enum rofferr
 roff_TH(ROFF_ARGS)
 {
 static enum rofferr
 roff_TH(ROFF_ARGS)
 {


@@ -1755,7 +1760,6 @@ roff_TH(ROFF_ARGS)
        return(ROFF_CONT);
 }
 
        return(ROFF_CONT);
 }
 

-/* ARGSUSED */

 static enum rofferr
 roff_TE(ROFF_ARGS)
 {
 static enum rofferr
 roff_TE(ROFF_ARGS)
 {


@@ -1768,7 +1772,6 @@ roff_TE(ROFF_ARGS)
        return(ROFF_IGN);
 }
 
        return(ROFF_IGN);
 }
 

-/* ARGSUSED */

 static enum rofferr
 roff_T_(ROFF_ARGS)
 {
 static enum rofferr
 roff_T_(ROFF_ARGS)
 {


@@ -1791,7 +1794,7 @@ roff_closeeqn(struct roff *r)
 #endif
 
 static void
 #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;
                int offs, const char *buf)
 {
        struct eqn_node *e;


@@ -1813,7 +1816,6 @@ roff_openeqn(struct roff *r, const char *name, int line,
        }
 }
 
        }
 }
 

-/* ARGSUSED */

 static enum rofferr
 roff_EQ(ROFF_ARGS)
 {
 static enum rofferr
 roff_EQ(ROFF_ARGS)
 {


@@ -1822,7 +1824,6 @@ roff_EQ(ROFF_ARGS)
        return(ROFF_IGN);
 }
 
        return(ROFF_IGN);
 }
 

-/* ARGSUSED */

 static enum rofferr
 roff_EN(ROFF_ARGS)
 {
 static enum rofferr
 roff_EN(ROFF_ARGS)
 {


@@ -1831,7 +1832,6 @@ roff_EN(ROFF_ARGS)
        return(ROFF_IGN);
 }
 
        return(ROFF_IGN);
 }
 

-/* ARGSUSED */

 static enum rofferr
 roff_TS(ROFF_ARGS)
 {
 static enum rofferr
 roff_TS(ROFF_ARGS)
 {


@@ -1853,7 +1853,6 @@ roff_TS(ROFF_ARGS)
        return(ROFF_IGN);
 }
 
        return(ROFF_IGN);
 }
 

-/* ARGSUSED */

 static enum rofferr
 roff_cc(ROFF_ARGS)
 {
 static enum rofferr
 roff_cc(ROFF_ARGS)
 {


@@ -1870,7 +1869,6 @@ roff_cc(ROFF_ARGS)
        return(ROFF_IGN);
 }
 
        return(ROFF_IGN);
 }
 

-/* ARGSUSED */

 static enum rofferr
 roff_tr(ROFF_ARGS)
 {
 static enum rofferr
 roff_tr(ROFF_ARGS)
 {


@@ -1892,9 +1890,9 @@ roff_tr(ROFF_ARGS)
                if ('\\' == *first) {
                        esc = mandoc_escape(&p, NULL, NULL);
                        if (ESCAPE_ERROR == esc) {
                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);
                                return(ROFF_IGN);
                        }
                        fsz = (size_t)(p - first);


@@ -1904,28 +1902,28 @@ roff_tr(ROFF_ARGS)
                if ('\\' == *second) {
                        esc = mandoc_escape(&p, NULL, NULL);
                        if (ESCAPE_ERROR == esc) {
                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) {
                                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) {
                        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)
                        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);
 
                free(r->xtab[(int)*first].p);
                r->xtab[(int)*first].p = mandoc_strndup(second, ssz);


@@ -1935,13 +1933,13 @@ roff_tr(ROFF_ARGS)
        return(ROFF_IGN);
 }
 
        return(ROFF_IGN);
 }
 

-/* ARGSUSED */

 static enum rofferr
 roff_so(ROFF_ARGS)
 {
        char *name;
 
 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
 
        /*
         * Handle `so'.  Be EXTREMELY careful, as we shouldn't be


@@ -1950,9 +1948,9 @@ roff_so(ROFF_ARGS)
         * or using absolute paths.
         */
 
         * or using absolute paths.
         */
 

-       name = *bufp + pos;

        if ('/' == *name || strstr(name, "../") || strstr(name, "/..")) {
        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);
        }
 
                return(ROFF_ERR);
        }
 


@@ -1960,7 +1958,6 @@ roff_so(ROFF_ARGS)
        return(ROFF_SO);
 }
 
        return(ROFF_SO);
 }
 

-/* ARGSUSED */

 static enum rofferr
 roff_userdef(ROFF_ARGS)
 {
 static enum rofferr
 roff_userdef(ROFF_ARGS)
 {


@@ -1989,14 +1986,9 @@ roff_userdef(ROFF_ARGS)
                        cp += 2;
                        continue;
                }
                        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;
                cp = n2 + (cp - n1);
                free(n1);
                n1 = n2;


@@ -2061,7 +2053,7 @@ roff_setstr(struct roff *r, const char *name, const char *string,
 {
 
        roff_setstrn(&r->strtab, name, strlen(name), string,
 {
 
        roff_setstrn(&r->strtab, name, strlen(name), string,

-                       string ? strlen(string) : 0, append);
+           string ? strlen(string) : 0, append);

 }
 
 static void
 }
 
 static void


@@ -2076,7 +2068,8 @@ roff_setstrn(struct roffkv **r, const char *name, size_t namesz,
        /* Search for an existing string with the same name. */
        n = *r;
 
        /* 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) {
                n = n->next;
 
        if (NULL == n) {


@@ -2142,8 +2135,8 @@ roff_getstrn(const struct roff *r, const char *name, size_t len)
        int i;
 
        for (n = r->strtab; n; n = n->next)
        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++)
                        return(n->val.p);
 
        for (i = 0; i < PREDEFS_MAX; i++)


@@ -2170,14 +2163,14 @@ roff_freestr(struct roffkv *r)
 const struct tbl_span *
 roff_span(const struct roff *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->tbl ? tbl_span(r->tbl) : NULL);
 }
 
 const struct eqn *
 roff_eqn(const struct roff *r)
 {

-       
+

        return(r->last_eqn ? &r->last_eqn->eqn : NULL);
 }
 
        return(r->last_eqn ? &r->last_eqn->eqn : NULL);
 }
 


@@ -2236,8 +2229,8 @@ roff_strdup(const struct roff *r, const char *p)
                         * Append the match to the array and move
                         * forward by its keysize.
                         */
                         * 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;
                        memcpy(res + ssz, cp->val.p, cp->val.sz);
                        ssz += cp->val.sz;
                        p += (int)cp->key.sz;


@@ -2258,8 +2251,8 @@ roff_strdup(const struct roff *r, const char *p)
                        memcpy(res + ssz, pp, sz);
                        break;
                }
                        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.
                 */
                 * No need to warn: we already did so when
                 * roff_res() was called.
                 */


@@ -2274,7 +2267,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
  * 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