Clean up error reporting:

[mandoc.git] / roff.c

diff --git a/roff.c b/roff.c
index 46ed2d7c9bd895c862eb06c5e5447e487c22d1e5..c257ad41791575aa2e8cb9517798127228b82401 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,4 +1,4 @@
-/*     $Id: roff.c,v 1.210 2014/06/25 00:20:19 schwarze Exp $ */
+/*     $Id: roff.c,v 1.221 2014/07/07 21:36:20 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>


@@ -187,7 +187,7 @@ 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 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 *,
 static int              roff_getnum(const char *, int *, int *);
 static int              roff_getop(const char *, int *, char *);
 static int              roff_getregn(const struct roff *,


@@ -200,7 +200,8 @@ 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 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 *,
                                char **, size_t *, int, int);
 static enum rofferr     roff_parsetext(char **, size_t *, int, int *);
 static enum rofferr     roff_res(struct roff *,
                                char **, size_t *, int, int);


@@ -499,7 +500,7 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int ln, int pos)
        size_t           naml;  /* actual length of the escape name */
        int              expand_count;  /* to avoid infinite loops */
        int              npos;  /* position in numeric expression */
        size_t           naml;  /* actual length of the escape name */
        int              expand_count;  /* to avoid infinite loops */
        int              npos;  /* position in numeric expression */

-       int              irc;   /* return code from roff_evalnum() */
+       int              arg_complete; /* argument not interrupted by eol */

        char             term;  /* character terminating the escape */
 
        expand_count = 0;
        char             term;  /* character terminating the escape */
 
        expand_count = 0;


@@ -541,8 +542,9 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int ln, int pos)
                        break;
                default:
                        if (ESCAPE_ERROR == mandoc_escape(&cp, NULL, NULL))
                        break;
                default:
                        if (ESCAPE_ERROR == mandoc_escape(&cp, NULL, NULL))

-                               mandoc_msg(MANDOCERR_BADESCAPE, r->parse,
-                                   ln, (int)(stesc - *bufp), NULL);
+                               mandoc_vmsg(MANDOCERR_ESC_BAD,
+                                   r->parse, ln, (int)(stesc - *bufp),
+                                   "%.*s", (int)(cp - stesc), stesc);

                        continue;
                }
 
                        continue;
                }
 


@@ -584,10 +586,12 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int ln, int pos)
 
                /* Advance to the end of the name. */
 
 
                /* Advance to the end of the name. */
 

+               arg_complete = 1;

                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);
+                               mandoc_msg(MANDOCERR_ESC_BAD, r->parse,
+                                   ln, (int)(stesc - *bufp), stesc);
+                               arg_complete = 0;

                                break;
                        }
                        if (0 == maxl && *cp == term) {
                                break;
                        }
                        if (0 == maxl && *cp == term) {


@@ -603,28 +607,34 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int ln, int pos)
 
                switch (stesc[1]) {
                case '*':
 
                switch (stesc[1]) {
                case '*':

-                       res = roff_getstrn(r, stnam, naml);
+                       if (arg_complete)
+                               res = roff_getstrn(r, stnam, naml);

                        break;
                case 'B':
                        npos = 0;
                        break;
                case 'B':
                        npos = 0;

-                       irc = roff_evalnum(stnam, &npos, NULL, 0);
-                       ubuf[0] = irc && stnam + npos + 1 == cp
-                           ? '1' : '0';
+                       ubuf[0] = arg_complete &&
+                           roff_evalnum(stnam, &npos, NULL, 0) &&
+                           stnam + npos + 1 == cp ? '1' : '0';

                        ubuf[1] = '\0';
                        break;
                case 'n':
                        ubuf[1] = '\0';
                        break;
                case 'n':

-                       (void)snprintf(ubuf, sizeof(ubuf), "%d",
-                           roff_getregn(r, stnam, naml));
+                       if (arg_complete)
+                               (void)snprintf(ubuf, sizeof(ubuf), "%d",
+                                   roff_getregn(r, stnam, naml));
+                       else
+                               ubuf[0] = '\0';

                        break;
                case 'w':
                        break;
                case 'w':

+                       /* use even incomplete args */

                        (void)snprintf(ubuf, sizeof(ubuf), "%d",
                            24 * (int)naml);
                        break;
                }
 
                if (NULL == res) {
                        (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_vmsg(MANDOCERR_STR_UNDEF,
+                           r->parse, ln, (int)(stesc - *bufp),
+                           "%.*s", (int)naml, stnam);

                        res = "";
                }
 
                        res = "";
                }
 


@@ -764,7 +774,7 @@ roff_parseln(struct roff *r, int ln, char **bufp,
         * the compilers handle it.
         */
 
         * 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(ROFF_CONT);
 
        assert(roffs[t].proc);


@@ -776,18 +786,19 @@ roff_endparse(struct roff *r)
 {
 
        if (r->last)
 {
 
        if (r->last)

-               mandoc_msg(MANDOCERR_SCOPEEXIT, r->parse,
-                   r->last->line, r->last->col, NULL);
+               mandoc_msg(MANDOCERR_BLK_NOEND, r->parse,
+                   r->last->line, r->last->col,
+                   roffs[r->last->tok].name);

 
        if (r->eqn) {
 
        if (r->eqn) {

-               mandoc_msg(MANDOCERR_SCOPEEXIT, r->parse,
-                   r->eqn->eqn.ln, r->eqn->eqn.pos, NULL);
+               mandoc_msg(MANDOCERR_BLK_NOEND, r->parse,
+                   r->eqn->eqn.ln, r->eqn->eqn.pos, "EQ");

                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_BLK_NOEND, r->parse,
+                   r->tbl->line, r->tbl->pos, "TS");

                tbl_end(&r->tbl);
        }
 }
                tbl_end(&r->tbl);
        }
 }


@@ -797,28 +808,26 @@ roff_endparse(struct roff *r)
  * form of ".foo xxx" in the usual way.
  */
 static enum rofft
  * 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;
 
        const char      *mac;
        size_t           maclen;
        enum rofft       t;
 

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

 
 

-       /* We stop the macro parse at an escape, tab, space, or nil. */
+       if ('\0' == *cp || '"' == *cp || '\t' == *cp || ' ' == *cp)
+               return(ROFF_MAX);

 
 

-       mac = buf + *pos;
-       maclen = strcspn(mac, " \\\t\0");
+       mac = cp;
+       maclen = roff_getname(r, &cp, ln, ppos);

 
        t = (r->current_string = roff_getstrn(r, mac, maclen))
            ? ROFF_USERDEF : roffhash_find(mac, maclen);
 
 
        t = (r->current_string = roff_getstrn(r, mac, maclen))
            ? ROFF_USERDEF : roffhash_find(mac, maclen);
 

-       *pos += (int)maclen;
-
-       while (buf[*pos] && ' ' == buf[*pos])
-               (*pos)++;
+       if (ROFF_MAX != t)
+               *pos = cp - buf;

 
        return(t);
 }
 
        return(t);
 }


@@ -833,17 +842,17 @@ roff_cblock(ROFF_ARGS)
         */
 
        if (NULL == r->last) {
         */
 
        if (NULL == r->last) {

-               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse,
+                   ln, ppos, "..");

                return(ROFF_IGN);
        }
 
        switch (r->last->tok) {
        case ROFF_am:
                return(ROFF_IGN);
        }
 
        switch (r->last->tok) {
        case ROFF_am:

+               /* ROFF_am1 is remapped to ROFF_am in roff_block(). */

                /* FALLTHROUGH */
        case ROFF_ami:
                /* FALLTHROUGH */
                /* FALLTHROUGH */
        case ROFF_ami:
                /* FALLTHROUGH */

-       case ROFF_am1:
-               /* FALLTHROUGH */

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


@@ -852,12 +861,14 @@ roff_cblock(ROFF_ARGS)
        case ROFF_ig:
                break;
        default:
        case ROFF_ig:
                break;
        default:

-               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse,
+                   ln, ppos, "..");

                return(ROFF_IGN);
        }
 
        if ((*bufp)[pos])
                return(ROFF_IGN);
        }
 
        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);
 
        roffnode_pop(r);
        roffnode_cleanscope(r);


@@ -881,7 +892,8 @@ roff_ccond(struct roff *r, int ln, int ppos)
 {
 
        if (NULL == r->last) {
 {
 
        if (NULL == r->last) {

-               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse,
+                   ln, ppos, "\\}");

                return;
        }
 
                return;
        }
 


@@ -893,12 +905,14 @@ roff_ccond(struct roff *r, int ln, int ppos)
        case ROFF_if:
                break;
        default:
        case ROFF_if:
                break;
        default:

-               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse,
+                   ln, ppos, "\\}");

                return;
        }
 
        if (r->last->endspan > -1) {
                return;
        }
 
        if (r->last->endspan > -1) {

-               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse,
+                   ln, ppos, "\\}");

                return;
        }
 
                return;
        }
 


@@ -910,36 +924,46 @@ roff_ccond(struct roff *r, int ln, int ppos)
 static enum rofferr
 roff_block(ROFF_ARGS)
 {
 static enum rofferr
 roff_block(ROFF_ARGS)
 {

-       int             sv;
-       size_t          sz;
-       char            *name;
+       const char      *name;
+       char            *iname, *cp;
+       size_t           namesz;

 
 

-       name = NULL;
+       /* Ignore groff compatibility mode for now. */

 
 

-       if (ROFF_ig != tok) {
-               if ('\0' == (*bufp)[pos]) {
-                       mandoc_msg(MANDOCERR_NOARGS, r->parse, ln, ppos, NULL);
-                       return(ROFF_IGN);
-               }
+       if (ROFF_de1 == tok)
+               tok = ROFF_de;
+       else if (ROFF_am1 == tok)
+               tok = ROFF_am;

 
 

-               /*
-                * Re-write `de1', since we don't really care about
-                * groff's strange compatibility mode, into `de'.
-                */
+       /* Parse the macro name argument. */

 
 

-               if (ROFF_de1 == tok)
-                       tok = ROFF_de;
-               if (ROFF_de == tok)
-                       name = *bufp + pos;
-               else
-                       mandoc_msg(MANDOCERR_REQUEST, r->parse, ln, ppos,
-                           roffs[tok].name);
+       cp = *bufp + pos;
+       if (ROFF_ig == tok) {
+               iname = NULL;
+               namesz = 0;
+       } else {
+               iname = cp;
+               namesz = roff_getname(r, &cp, ln, ppos);
+               iname[namesz] = '\0';
+       }
+
+       /* Resolve the macro name argument if it is indirect. */

 
 

-               while ((*bufp)[pos] && ! isspace((unsigned char)(*bufp)[pos]))
-                       pos++;
+       if (namesz && (ROFF_dei == tok || ROFF_ami == tok)) {
+               if (NULL == (name = roff_getstrn(r, iname, namesz))) {
+                       mandoc_vmsg(MANDOCERR_STR_UNDEF,
+                           r->parse, ln, (int)(iname - *bufp),
+                           "%.*s", (int)namesz, iname);
+                       namesz = 0;
+               } else
+                       namesz = strlen(name);
+       } else
+               name = iname;

 
 

-               while (isspace((unsigned char)(*bufp)[pos]))
-                       (*bufp)[pos++] = '\0';
+       if (0 == namesz && ROFF_ig != tok) {
+               mandoc_msg(MANDOCERR_REQ_EMPTY, r->parse,
+                   ln, ppos, roffs[tok].name);
+               return(ROFF_IGN);

        }
 
        roffnode_push(r, tok, name, ln, ppos);
        }
 
        roffnode_push(r, tok, name, ln, ppos);


@@ -950,37 +974,36 @@ roff_block(ROFF_ARGS)
         * appended from roff_block_text() in multiline mode.
         */
 
         * appended from roff_block_text() in multiline mode.
         */
 

-       if (ROFF_de == tok)
-               roff_setstr(r, name, "", 0);
+       if (ROFF_de == tok || ROFF_dei == tok)
+               roff_setstrn(&r->strtab, name, namesz, "", 0, 0);

 
 

-       if ('\0' == (*bufp)[pos])
+       if ('\0' == *cp)

                return(ROFF_IGN);
 
                return(ROFF_IGN);
 

-       /* If present, process the custom end-of-line marker. */
-
-       sv = pos;
-       while ((*bufp)[pos] && ! isspace((unsigned char)(*bufp)[pos]))
-               pos++;
+       /* Get the custom end marker. */

 
 

-       /*
-        * 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.
-        */
+       iname = cp;
+       namesz = roff_getname(r, &cp, ln, ppos);

 
 

-       assert(pos > sv);
-       sz = (size_t)(pos - sv);
+       /* Resolve the end marker if it is indirect. */

 
 

-       if (1 == sz && '.' == (*bufp)[sv])
-               return(ROFF_IGN);
-
-       r->last->end = mandoc_malloc(sz + 1);
+       if (namesz && (ROFF_dei == tok || ROFF_ami == tok)) {
+               if (NULL == (name = roff_getstrn(r, iname, namesz))) {
+                       mandoc_vmsg(MANDOCERR_STR_UNDEF,
+                           r->parse, ln, (int)(iname - *bufp),
+                           "%.*s", (int)namesz, iname);
+                       namesz = 0;
+               } else
+                       namesz = strlen(name);
+       } else
+               name = iname;

 
 

-       memcpy(r->last->end, *bufp + sv, sz);
-       r->last->end[(int)sz] = '\0';
+       if (namesz)
+               r->last->end = mandoc_strndup(name, namesz);

 
 

-       if ((*bufp)[pos])
-               mandoc_msg(MANDOCERR_ARGSLOST, r->parse, ln, pos, NULL);
+       if ('\0' != *cp)
+               mandoc_vmsg(MANDOCERR_ARG_EXCESS, r->parse,
+                   ln, pos, ".%s ... %s", roffs[tok].name, cp);

 
        return(ROFF_IGN);
 }
 
        return(ROFF_IGN);
 }


@@ -1016,7 +1039,7 @@ roff_block_sub(ROFF_ARGS)
                                i++;
 
                        pos = i;
                                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);
                }
                                return(ROFF_RERUN);
                        return(ROFF_IGN);
                }


@@ -1027,14 +1050,10 @@ roff_block_sub(ROFF_ARGS)
         * pulling it out of the hashtable.
         */
 
         * 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
-        * in `de' blocks; elsewhere, simply throw them away.
-        */

        if (ROFF_cblock != t) {
        if (ROFF_cblock != t) {

-               if (ROFF_de == tok)
+               if (ROFF_ig != tok)

                        roff_setstr(r, r->last->name, *bufp + ppos, 2);
                return(ROFF_IGN);
        }
                        roff_setstr(r, r->last->name, *bufp + ppos, 2);
                return(ROFF_IGN);
        }


@@ -1047,7 +1066,7 @@ static enum rofferr
 roff_block_text(ROFF_ARGS)
 {
 
 roff_block_text(ROFF_ARGS)
 {
 

-       if (ROFF_de == tok)
+       if (ROFF_ig != tok)

                roff_setstr(r, r->last->name, *bufp + pos, 2);
 
        return(ROFF_IGN);
                roff_setstr(r, r->last->name, *bufp + pos, 2);
 
        return(ROFF_IGN);


@@ -1062,7 +1081,7 @@ roff_cond_sub(ROFF_ARGS)
 
        rr = r->last->rule;
        roffnode_cleanscope(r);
 
        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
 
        /*
         * Fully handle known macros when they are structurally


@@ -1306,7 +1325,8 @@ roff_cond(ROFF_ARGS)
         */
 
        if ('\0' == (*bufp)[pos])
         */
 
        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;
 
 
        r->last->endspan = 1;
 


@@ -1318,29 +1338,31 @@ out:
 static enum rofferr
 roff_ds(ROFF_ARGS)
 {
 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);
 
        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. */
        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);
 }
 
        return(ROFF_IGN);
 }
 


@@ -1654,13 +1676,19 @@ roff_freereg(struct roffreg *reg)
 static enum rofferr
 roff_nr(ROFF_ARGS)
 {
 static enum rofferr
 roff_nr(ROFF_ARGS)
 {

-       const char      *key;
-       char            *val;
+       char            *key, *val;
+       size_t           keysz;

        int              iv;
        char             sign;
 
        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)
 
        sign = *val;
        if ('+' == sign || '-' == sign)


@@ -1676,11 +1704,14 @@ static enum rofferr
 roff_rr(ROFF_ARGS)
 {
        struct roffreg  *reg, **prev;
 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) {
 
        prev = &r->regtab;
        while (1) {


@@ -1702,12 +1733,15 @@ roff_rm(ROFF_ARGS)
 {
        const char       *name;
        char             *cp;
 {
        const char       *name;
        char             *cp;

+       size_t            namesz;

 
        cp = *bufp + pos;
        while ('\0' != *cp) {
 
        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);
 }
        }
        return(ROFF_IGN);
 }


@@ -1765,7 +1799,8 @@ roff_TE(ROFF_ARGS)
 {
 
        if (NULL == r->tbl)
 {
 
        if (NULL == r->tbl)

-               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse,
+                   ln, ppos, "TE");

        else
                tbl_end(&r->tbl);
 
        else
                tbl_end(&r->tbl);
 


@@ -1777,7 +1812,8 @@ roff_T_(ROFF_ARGS)
 {
 
        if (NULL == r->tbl)
 {
 
        if (NULL == r->tbl)

-               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse,
+                   ln, ppos, "T&");

        else
                tbl_restart(ppos, ln, r->tbl);
 
        else
                tbl_restart(ppos, ln, r->tbl);
 


@@ -1828,7 +1864,7 @@ static enum rofferr
 roff_EN(ROFF_ARGS)
 {
 
 roff_EN(ROFF_ARGS)
 {
 

-       mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
+       mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse, ln, ppos, "EN");

        return(ROFF_IGN);
 }
 
        return(ROFF_IGN);
 }
 


@@ -1838,7 +1874,8 @@ roff_TS(ROFF_ARGS)
        struct tbl_node *tbl;
 
        if (r->tbl) {
        struct tbl_node *tbl;
 
        if (r->tbl) {

-               mandoc_msg(MANDOCERR_SCOPEBROKEN, r->parse, ln, ppos, NULL);
+               mandoc_msg(MANDOCERR_BLK_BROKEN, r->parse,
+                   ln, ppos, "TS breaks TS");

                tbl_end(&r->tbl);
        }
 
                tbl_end(&r->tbl);
        }
 


@@ -1890,9 +1927,8 @@ 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_ESC_BAD, r->parse,
+                                   ln, (int)(p - *bufp), first);

                                return(ROFF_IGN);
                        }
                        fsz = (size_t)(p - first);
                                return(ROFF_IGN);
                        }
                        fsz = (size_t)(p - first);


@@ -1902,9 +1938,8 @@ 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_ESC_BAD, r->parse,
+                                   ln, (int)(p - *bufp), second);

                                return(ROFF_IGN);
                        }
                        ssz = (size_t)(p - second);
                                return(ROFF_IGN);
                        }
                        ssz = (size_t)(p - second);


@@ -2007,37 +2042,41 @@ roff_userdef(ROFF_ARGS)
           ROFF_REPARSE : ROFF_APPEND);
 }
 
           ROFF_REPARSE : ROFF_APPEND);
 }
 

-static char *
+static size_t

 roff_getname(struct roff *r, char **cpp, int ln, int pos)
 {
        char     *name, *cp;
 roff_getname(struct roff *r, char **cpp, int ln, int pos)
 {
        char     *name, *cp;

+       size_t    namesz;

 
        name = *cpp;
        if ('\0' == *name)
 
        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;
                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++;
                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;
        /* Read past spaces. */
        while (' ' == *cp)
                cp++;
 
        *cpp = cp;

-       return(name);
+       return(namesz);

 }
 
 /*
 }
 
 /*


@@ -2068,7 +2107,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) {