Sync to OpenBSD:

[mandoc.git] / roff.c

diff --git a/roff.c b/roff.c
index 6b19d32e44400dd1c15dc3f3f9bc95a48ff455a4..c42643cc5f9e5000fbb89cc6139fb7f8ed531803 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,4 +1,4 @@
-/*     $Id: roff.c,v 1.106 2010/12/02 10:53:03 kristaps Exp $ */
+/*     $Id: roff.c,v 1.108 2010/12/21 01:46:44 schwarze Exp $ */
 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -346,15 +346,40 @@ roff_alloc(struct regset *regs, void *data, const mandocmsg msg)
 static int
 roff_res(struct roff *r, char **bufp, size_t *szp, int pos)
 {
-       const char      *cp, *cpp, *st, *res;
+       const 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 */
        int              i, maxl;
        size_t           nsz;
        char            *n;
 
-       /* LINTED */
-       for (cp = &(*bufp)[pos]; (cpp = strstr(cp, "\\*")); cp++) {
-               cp = cpp + 2;
+       /* Search for a leading backslash and save a pointer to it. */
+
+       cp = *bufp + pos;
+       while (NULL != (cp = strchr(cp, '\\'))) {
+               stesc = cp++;
+
+               /*
+                * The second character must be an asterisk.
+                * If it isn't, skip it anyway:  It is escaped,
+                * so it can't start another escape sequence.
+                */
+
+               if ('\0' == *cp)
+                       return(1);
+               if ('*' != *cp++)
+                       continue;
+
+               /*
+                * The third character decides the length
+                * of the name of the string.
+                * Save a pointer to the name.
+                */
+
                switch (*cp) {
+               case ('\0'):
+                       return(1);
                case ('('):
                        cp++;
                        maxl = 2;
@@ -367,8 +392,9 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int pos)
                        maxl = 1;
                        break;
                }
+               stnam = cp;
 
-               st = cp;
+               /* Advance to the end of the name. */
 
                for (i = 0; 0 == maxl || i < maxl; i++, cp++) {
                        if ('\0' == *cp)
@@ -377,21 +403,26 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int pos)
                                break;
                }
 
-               res = roff_getstrn(r, st, (size_t)i);
+               /*
+                * Retrieve the replacement string; if it is
+                * undefined, resume searching for escapes.
+                */
+
+               res = roff_getstrn(r, stnam, (size_t)i);
 
                if (NULL == res) {
                        cp -= maxl ? 1 : 0;
                        continue;
                }
 
+               /* Replace the escape sequence by the string. */
+
                ROFF_DEBUG("roff: splicing reserved: [%.*s]\n", i, st);
 
                nsz = *szp + strlen(res) + 1;
                n = mandoc_malloc(nsz);
 
-               *n = '\0';
-
-               strlcat(n, *bufp, (size_t)(cpp - *bufp + 1));
+               strlcpy(n, *bufp, (size_t)(stesc - *bufp + 1));
                strlcat(n, res, nsz);
                strlcat(n, cp + (maxl ? 0 : 1), nsz);
 
@@ -463,8 +494,10 @@ roff_parseln(struct roff *r, int ln, char **bufp,
        if (ROFF_MAX == (t = roff_parse(r, *bufp, &pos)))
                return(ROFF_CONT);
 
-       ROFF_DEBUG("roff: intercept new-scope: %s, [%s]\n", 
-                       roffs[t].name, &(*bufp)[pos]);
+       ROFF_DEBUG("roff: intercept new-scope: [%s], [%s]\n", 
+                       ROFF_USERDEF == t ? r->current_string : roffs[t].name, 
+                       &(*bufp)[pos]);
+
        assert(roffs[t].proc);
        return((*roffs[t].proc)
                        (r, t, bufp, szp, 
@@ -561,6 +594,7 @@ roff_cblock(ROFF_ARGS)
        case (ROFF_am1):
                /* FALLTHROUGH */
        case (ROFF_de):
+               /* ROFF_de1 is remapped to ROFF_de in roff_block(). */
                /* FALLTHROUGH */
        case (ROFF_dei):
                /* FALLTHROUGH */
@@ -650,6 +684,12 @@ roff_block(ROFF_ARGS)
                        (*r->msg)(MANDOCERR_NOARGS, r->data, ln, ppos, NULL);
                        return(ROFF_IGN);
                }
+
+               /*
+                * Re-write `de1', since we don't really care about
+                * groff's strange compatibility mode, into `de'.
+                */
+
                if (ROFF_de1 == tok)
                        tok = ROFF_de;
                if (ROFF_de == tok)
@@ -657,8 +697,10 @@ roff_block(ROFF_ARGS)
                else
                        (*r->msg)(MANDOCERR_REQUEST, r->data, ln, ppos,
                            roffs[tok].name);
+
                while ((*bufp)[pos] && ' ' != (*bufp)[pos])
                        pos++;
+
                while (' ' == (*bufp)[pos])
                        (*bufp)[pos++] = '\0';
        }
@@ -670,14 +712,18 @@ roff_block(ROFF_ARGS)
         * with the same name, if there is one.  New content will be
         * added from roff_block_text() in multiline mode.
         */
+
        if (ROFF_de == tok)
                roff_setstr(r, name, "", 0);
 
        if ('\0' == (*bufp)[pos])
                return(ROFF_IGN);
 
+       /* If present, process the custom end-of-line marker. */
+
        sv = pos;
-       while ((*bufp)[pos] && ' ' != (*bufp)[pos] && 
+       while ((*bufp)[pos] &&
+                       ' ' != (*bufp)[pos] && 
                        '\t' != (*bufp)[pos])
                pos++;
 
@@ -699,8 +745,7 @@ roff_block(ROFF_ARGS)
        r->last->end[(int)sz] = '\0';
 
        if ((*bufp)[pos])
-               if ( ! (*r->msg)(MANDOCERR_ARGSLOST, r->data, ln, pos, NULL))
-                       return(ROFF_ERR);
+               (*r->msg)(MANDOCERR_ARGSLOST, r->data, ln, pos, NULL);
 
        return(ROFF_IGN);
 }
@@ -933,9 +978,8 @@ roff_cond(ROFF_ARGS)
         */
 
        if ('\0' == (*bufp)[pos] && sv != pos) {
-               if ((*r->msg)(MANDOCERR_NOARGS, r->data, ln, ppos, NULL))
-                       return(ROFF_IGN);
-               return(ROFF_ERR);
+               (*r->msg)(MANDOCERR_NOARGS, r->data, ln, ppos, NULL);
+               return(ROFF_IGN);
        }
 
        roffnode_push(r, tok, NULL, ln, ppos);