Memory-corruption fix.

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index 9ab96374fde312b585482d99b6e9c223204fd24a..c6aa83714af7fcd8a10d850723631ed9a4215f57 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/* $Id: mdoc.c,v 1.28 2009/01/12 16:39:57 kristaps Exp $ */
+/* $Id: mdoc.c,v 1.54 2009/03/08 12:40:27 kristaps Exp $ */

 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -26,6 +26,20 @@
 
 #include "private.h"
 
 
 #include "private.h"
 

+/*
+ * Main caller in the libmdoc library.  This begins the parsing routine,
+ * handles allocation of data, and so forth.  Most of the "work" is done
+ * in macro.c and validate.c.
+ */
+
+static struct mdoc_node *mdoc_node_alloc(const struct mdoc *);
+static int               mdoc_node_append(struct mdoc *, 
+                               struct mdoc_node *);
+
+static int               parsetext(struct mdoc *, int, char *);
+static int               parsemacro(struct mdoc *, int, char *);
+
+

 const  char *const __mdoc_macronames[MDOC_MAX] = {              
        "\\\"",         "Dd",           "Dt",           "Os",
        "Sh",           "Ss",           "Pp",           "D1",
 const  char *const __mdoc_macronames[MDOC_MAX] = {              
        "\\\"",         "Dd",           "Dt",           "Os",
        "Sh",           "Ss",           "Pp",           "D1",


@@ -56,7 +70,7 @@ const char *const __mdoc_macronames[MDOC_MAX] = {
        "Tn",           "Ux",           "Xc",           "Xo",
        "Fo",           "Fc",           "Oo",           "Oc",
        "Bk",           "Ek",           "Bt",           "Hf",
        "Tn",           "Ux",           "Xc",           "Xo",
        "Fo",           "Fc",           "Oo",           "Oc",
        "Bk",           "Ek",           "Bt",           "Hf",

-       "Fr",           "Ud",
+       "Fr",           "Ud",           "Lb",

        };
 
 const  char *const __mdoc_argnames[MDOC_ARG_MAX] = {            
        };
 
 const  char *const __mdoc_argnames[MDOC_ARG_MAX] = {            


@@ -67,156 +81,27 @@ const      char *const __mdoc_argnames[MDOC_ARG_MAX] = {
        "tag",                  "diag",                 "hang",          
        "ohang",                "inset",                "column",        
        "width",                "compact",              "std",   
        "tag",                  "diag",                 "hang",          
        "ohang",                "inset",                "column",        
        "width",                "compact",              "std",   

-       "p1003.1-88",           "p1003.1-90",           "p1003.1-96",
-       "p1003.1-2001",         "p1003.1-2004",         "p1003.1",
-       "p1003.1b",             "p1003.1b-93",          "p1003.1c-95",
-       "p1003.1g-2000",        "p1003.2-92",           "p1387.2-95",
-       "p1003.2",              "p1387.2",              "isoC-90",
-       "isoC-amd1",            "isoC-tcor1",           "isoC-tcor2",
-       "isoC-99",              "ansiC",                "ansiC-89",
-       "ansiC-99",             "ieee754",              "iso8802-3",
-       "xpg3",                 "xpg4",                 "xpg4.2",
-       "xpg4.3",               "xbd5",                 "xcu5",
-       "xsh5",                 "xns5",                 "xns5.2d2.0",
-       "xcurses4.2",           "susv2",                "susv3",
-       "svid4",                "filled",               "words",
-       "emphasis",             "symbolic",
+       "filled",               "words",                "emphasis",
+       "symbolic"

        };
 
        };
 

-const  struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
-       { NULL, 0 }, /* \" */
-       { macro_constant, MDOC_PROLOGUE }, /* Dd */
-       { macro_constant, MDOC_PROLOGUE }, /* Dt */
-       { macro_constant, MDOC_PROLOGUE }, /* Os */
-       { macro_scoped, 0 }, /* Sh */
-       { macro_scoped, 0 }, /* Ss */ 
-       { macro_text, 0 }, /* Pp */ 
-       { macro_scoped_line, MDOC_PARSED }, /* D1 */
-       { macro_scoped_line, MDOC_PARSED }, /* Dl */
-       { macro_scoped, MDOC_EXPLICIT }, /* Bd */
-       { macro_close_explicit, 0 }, /* Ed */
-       { macro_scoped, MDOC_EXPLICIT }, /* Bl */
-       { macro_close_explicit, 0 }, /* El */
-       { macro_scoped, MDOC_NESTED | MDOC_PARSED | MDOC_TABSEP}, /* It */
-       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */ 
-       { macro_constant, MDOC_PARSED }, /* An */
-       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */
-       { macro_constant, MDOC_QUOTABLE }, /* Cd */
-       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Cm */
-       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Dv */ 
-       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Er */ 
-       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ev */ 
-       { macro_constant, 0 }, /* Ex */
-       { macro_text, MDOC_CALLABLE | MDOC_QUOTABLE | MDOC_PARSED }, /* Fa */ 
-       { macro_constant, 0 }, /* Fd */ 
-       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Fl */
-       { macro_text, MDOC_CALLABLE | MDOC_QUOTABLE | MDOC_PARSED }, /* Fn */ 
-       { macro_text, MDOC_PARSED }, /* Ft */ 
-       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ic */ 
-       { macro_constant, 0 }, /* In */ 
-       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Li */
-       { macro_constant, 0 }, /* Nd */ 
-       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Nm */ 
-       { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Op */
-       { macro_obsolete, 0 }, /* Ot */
-       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Pa */
-       { macro_constant, 0 }, /* Rv */
-       /* XXX - .St supposed to be (but isn't) callable. */
-       { macro_constant_delimited, MDOC_PARSED }, /* St */ 
-       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Va */
-       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Vt */ 
-       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Xr */
-       { macro_constant, MDOC_QUOTABLE }, /* %A */
-       { macro_constant, MDOC_QUOTABLE }, /* %B */
-       { macro_constant, MDOC_QUOTABLE }, /* %D */
-       { macro_constant, MDOC_QUOTABLE }, /* %I */
-       { macro_constant, MDOC_QUOTABLE }, /* %J */
-       { macro_constant, MDOC_QUOTABLE }, /* %N */
-       { macro_constant, MDOC_QUOTABLE }, /* %O */
-       { macro_constant, MDOC_QUOTABLE }, /* %P */
-       { macro_constant, MDOC_QUOTABLE }, /* %R */
-       { macro_constant, MDOC_QUOTABLE }, /* %T */
-       { macro_constant, MDOC_QUOTABLE }, /* %V */
-       { macro_close_explicit, MDOC_CALLABLE | MDOC_PARSED }, /* Ac */
-       { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED }, /* Ao */
-       { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Aq */
-       { macro_constant, 0 }, /* At */
-       { macro_close_explicit, MDOC_CALLABLE | MDOC_PARSED }, /* Bc */
-       { macro_scoped, MDOC_EXPLICIT }, /* Bf */ 
-       { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED }, /* Bo */
-       { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Bq */
-       { macro_constant_delimited, MDOC_PARSED }, /* Bsx */
-       { macro_constant_delimited, MDOC_PARSED }, /* Bx */
-       { macro_constant, 0 }, /* Db */
-       { macro_close_explicit, MDOC_CALLABLE | MDOC_PARSED }, /* Dc */
-       { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED }, /* Do */
-       { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Dq */
-       { macro_close_explicit, MDOC_CALLABLE | MDOC_PARSED }, /* Ec */
-       { macro_close_explicit, 0 }, /* Ef */
-       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Em */ 
-       { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED }, /* Eo */
-       { macro_constant_delimited, MDOC_PARSED }, /* Fx */
-       { macro_text, MDOC_PARSED }, /* Ms */
-       { macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* No */
-       { macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Ns */
-       { macro_constant_delimited, MDOC_PARSED }, /* Nx */
-       { macro_constant_delimited, MDOC_PARSED }, /* Ox */
-       { macro_close_explicit, MDOC_CALLABLE | MDOC_PARSED }, /* Pc */
-       { macro_constant, MDOC_PARSED }, /* Pf */
-       { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED }, /* Po */
-       { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Pq */
-       { macro_close_explicit, MDOC_CALLABLE | MDOC_PARSED }, /* Qc */
-       { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ql */
-       { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED }, /* Qo */
-       { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Qq */
-       { macro_close_explicit, 0 }, /* Re */
-       { macro_scoped, MDOC_EXPLICIT }, /* Rs */
-       { macro_close_explicit, MDOC_CALLABLE | MDOC_PARSED }, /* Sc */
-       { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED }, /* So */
-       { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Sq */
-       { macro_constant, 0 }, /* Sm */
-       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Sx */
-       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Sy */
-       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Tn */
-       { macro_constant_delimited, MDOC_PARSED }, /* Ux */
-       { macro_close_explicit, MDOC_CALLABLE | MDOC_PARSED }, /* Xc */
-       { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED }, /* Xo */
-       /* XXX - .Fo supposed to be (but isn't) callable. */
-       { macro_scoped, MDOC_EXPLICIT | MDOC_PARSED }, /* Fo */ 
-       /* XXX - .Fc supposed to be (but isn't) callable. */
-       { macro_close_explicit, MDOC_PARSED }, /* Fc */ 
-       { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED }, /* Oo */
-       { macro_close_explicit, MDOC_CALLABLE | MDOC_PARSED }, /* Oc */
-       { macro_scoped, MDOC_EXPLICIT }, /* Bk */
-       { macro_close_explicit, 0 }, /* Ek */
-       { macro_constant, 0 }, /* Bt */
-       { macro_constant, 0 }, /* Hf */
-       { macro_obsolete, 0 }, /* Fr */
-       { macro_constant, 0 }, /* Ud */
-};
-

 const  char * const *mdoc_macronames = __mdoc_macronames;
 const  char * const *mdoc_argnames = __mdoc_argnames;
 const  char * const *mdoc_macronames = __mdoc_macronames;
 const  char * const *mdoc_argnames = __mdoc_argnames;

-const  struct mdoc_macro * const mdoc_macros = __mdoc_macros;

 
 
 
 

-static struct mdoc_arg  *argdup(size_t, const struct mdoc_arg *);
-static void              argfree(size_t, struct mdoc_arg *);
-static void              argcpy(struct mdoc_arg *, 
-                               const struct mdoc_arg *);
+const struct mdoc_node *
+mdoc_node(const struct mdoc *mdoc)
+{

 
 

-static void              mdoc_node_freelist(struct mdoc_node *);
-static int               mdoc_node_append(struct mdoc *, 
-                               struct mdoc_node *);
-static void              mdoc_elem_free(struct mdoc_elem *);
-static void              mdoc_text_free(struct mdoc_text *);
+       return(mdoc->first);
+}

 
 
 
 

-const struct mdoc_node *
-mdoc_result(struct mdoc *mdoc)
+const struct mdoc_meta *
+mdoc_meta(const struct mdoc *mdoc)

 {
 
 {
 

-       return(mdoc->first);
+       return(&mdoc->meta);

 }
 
 
 }
 
 


@@ -228,7 +113,17 @@ mdoc_free(struct mdoc *mdoc)
                mdoc_node_freelist(mdoc->first);
        if (mdoc->htab)
                mdoc_tokhash_free(mdoc->htab);
                mdoc_node_freelist(mdoc->first);
        if (mdoc->htab)
                mdoc_tokhash_free(mdoc->htab);

-       
+       if (mdoc->meta.title)
+               free(mdoc->meta.title);
+       if (mdoc->meta.os)
+               free(mdoc->meta.os);
+       if (mdoc->meta.name)
+               free(mdoc->meta.name);
+       if (mdoc->meta.arch)
+               free(mdoc->meta.arch);
+       if (mdoc->meta.vol)
+               free(mdoc->meta.vol);
+

        free(mdoc);
 }
 
        free(mdoc);
 }
 


@@ -241,7 +136,8 @@ mdoc_alloc(void *data, const struct mdoc_cb *cb)
        p = xcalloc(1, sizeof(struct mdoc));
 
        p->data = data;
        p = xcalloc(1, sizeof(struct mdoc));
 
        p->data = data;

-       (void)memcpy(&p->cb, cb, sizeof(struct mdoc_cb));
+       if (cb)
+               (void)memcpy(&p->cb, cb, sizeof(struct mdoc_cb));

 
        p->last = xcalloc(1, sizeof(struct mdoc_node));
        p->last->type = MDOC_ROOT;
 
        p->last = xcalloc(1, sizeof(struct mdoc_node));
        p->last->type = MDOC_ROOT;


@@ -272,179 +168,115 @@ mdoc_endparse(struct mdoc *mdoc)
 }
 
 
 }
 
 

+/*
+ * Main parse routine.  Parses a single line -- really just hands off to
+ * the macro or text parser.
+ */

 int
 int

-mdoc_parseln(struct mdoc *mdoc, int line, char *buf)
+mdoc_parseln(struct mdoc *m, int ln, char *buf)

 {
 {

-       int               c, i;
-       char              tmp[5];
-
-       if (MDOC_HALT & mdoc->flags)
-               return(0);
-
-       if ('.' != *buf) {
-               if (SEC_PROLOGUE != mdoc->sec_lastn) {
-                       if ( ! mdoc_word_alloc(mdoc, line, 0, buf))
-                               return(0);
-                       mdoc->next = MDOC_NEXT_SIBLING;
-                       return(1);
-               }
-               return(mdoc_perr(mdoc, line, 0, ERR_SYNTAX_NOTEXT));
-       }
-
-       if (buf[1] && '\\' == buf[1])
-               if (buf[2] && '\"' == buf[2])
-                       return(1);
-
-       i = 1;
-       while (buf[i] && ! isspace(buf[i]) && i < (int)sizeof(tmp))
-               i++;
-
-       if (i == (int)sizeof(tmp)) {
-               mdoc->flags |= MDOC_HALT;
-               return(mdoc_perr(mdoc, line, 1, ERR_MACRO_NOTSUP));
-       } else if (i <= 2) {
-               mdoc->flags |= MDOC_HALT;
-               return(mdoc_perr(mdoc, line, 1, ERR_MACRO_NOTSUP));
-       }
-
-       i--;
-
-       (void)memcpy(tmp, buf + 1, (size_t)i);
-       tmp[i++] = 0;
-
-       if (MDOC_MAX == (c = mdoc_find(mdoc, tmp))) {
-               mdoc->flags |= MDOC_HALT;
-               return(mdoc_perr(mdoc, line, 1, ERR_MACRO_NOTSUP));
-       }

 
 

-       while (buf[i] && isspace(buf[i]))
-               i++;
+       /* If in error-mode, then we parse no more. */

 
 

-       if ( ! mdoc_macro(mdoc, c, line, 1, &i, buf)) {
-               mdoc->flags |= MDOC_HALT;
+       if (MDOC_HALT & m->flags)

                return(0);
                return(0);

-       }
-       return(1);
+
+       return('.' == *buf ? parsemacro(m, ln, buf) :
+                       parsetext(m, ln, buf));

 }
 
 
 void
 }
 
 
 void

-mdoc_msg(struct mdoc *mdoc, const char *fmt, ...)
+mdoc_vmsg(struct mdoc *mdoc, int ln, int pos, const char *fmt, ...)

 {
 {

-       struct mdoc_node *n;
-       va_list           ap;

        char              buf[256];
        char              buf[256];

+       va_list           ap;

 
        if (NULL == mdoc->cb.mdoc_msg)
                return;
 
 
        if (NULL == mdoc->cb.mdoc_msg)
                return;
 

-       n = mdoc->last;
-       assert(n);
-

        va_start(ap, fmt);
        va_start(ap, fmt);

-       (void)vsnprintf(buf, sizeof(buf), fmt, ap);
+       (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);

        va_end(ap);
        va_end(ap);

-
-       (*mdoc->cb.mdoc_msg)(mdoc->data, n->line, n->pos, buf);
+       (*mdoc->cb.mdoc_msg)(mdoc->data, ln, pos, buf);

 }
 
 
 int
 }
 
 
 int

-mdoc_perr(struct mdoc *mdoc, 
-               int line, int pos, enum mdoc_err type)
+mdoc_verr(struct mdoc *mdoc, int ln, int pos, 
+               const char *fmt, ...)

 {
 {

+       char             buf[256];
+       va_list          ap;

 
        if (NULL == mdoc->cb.mdoc_err)
                return(0);
 
        if (NULL == mdoc->cb.mdoc_err)
                return(0);

-       return((*mdoc->cb.mdoc_err)(mdoc->data, line, pos, type));
+
+       va_start(ap, fmt);
+       (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
+       va_end(ap);
+       return((*mdoc->cb.mdoc_err)(mdoc->data, ln, pos, buf));

 }
 
 
 int
 }
 
 
 int

-mdoc_pwarn(struct mdoc *mdoc, 
-               int line, int pos, enum mdoc_warn type)
+mdoc_vwarn(struct mdoc *mdoc, int ln, int pos, 
+               enum mdoc_warn type, const char *fmt, ...)

 {
 {

+       char             buf[256];
+       va_list          ap;

 
        if (NULL == mdoc->cb.mdoc_warn)
                return(0);
 
        if (NULL == mdoc->cb.mdoc_warn)
                return(0);

-       return((*mdoc->cb.mdoc_warn)(mdoc->data, line, pos, type));
+
+       va_start(ap, fmt);
+       (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
+       va_end(ap);
+       return((*mdoc->cb.mdoc_warn)(mdoc->data, ln, pos, type, buf));

 }
 
 
 int
 }
 
 
 int

-mdoc_macro(struct mdoc *mdoc, int tok, 
-               int ln, int ppos, int *pos, char *buf)
+mdoc_macro(struct mdoc *m, int tok, 
+               int ln, int pp, int *pos, char *buf)

 {
 
 {
 

-       if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) &&
-                       SEC_PROLOGUE == mdoc->sec_lastn)
-               return(mdoc_perr(mdoc, ln, ppos, ERR_SEC_PROLOGUE));
+       /* FIXME - these should happen during validation. */
+
+       if (MDOC_PROLOGUE & mdoc_macros[tok].flags && 
+                       SEC_PROLOGUE != m->lastnamed)
+               return(mdoc_perr(m, ln, pp, 
+                               "disallowed in document body"));

 
 

-       if (NULL == (mdoc_macros[tok].fp))
-               return(mdoc_perr(mdoc, ln, ppos, ERR_MACRO_NOTSUP));
+       if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && 
+                       SEC_PROLOGUE == m->lastnamed)
+               return(mdoc_perr(m, ln, pp, 
+                               "disallowed in prologue"));

 
 

-       if (1 != ppos && ! (MDOC_CALLABLE & mdoc_macros[tok].flags))
-               return(mdoc_perr(mdoc, ln, ppos, ERR_MACRO_NOTCALL));
+       if (1 != pp && ! (MDOC_CALLABLE & mdoc_macros[tok].flags))
+               return(mdoc_perr(m, ln, pp, "not callable"));

 
 

-       return((*mdoc_macros[tok].fp)(mdoc, tok, ln, ppos, pos, buf));
+       return((*mdoc_macros[tok].fp)(m, tok, ln, pp, pos, buf));

 }
 
 
 static int
 mdoc_node_append(struct mdoc *mdoc, struct mdoc_node *p)
 {
 }
 
 
 static int
 mdoc_node_append(struct mdoc *mdoc, struct mdoc_node *p)
 {

-       const char       *on, *ot, *act;

 
        assert(mdoc->last);
        assert(mdoc->first);
        assert(MDOC_ROOT != p->type);
 
 
        assert(mdoc->last);
        assert(mdoc->first);
        assert(MDOC_ROOT != p->type);
 

-       if (MDOC_TEXT == mdoc->last->type)
-               on = "<text>";
-       else if (MDOC_ROOT == mdoc->last->type)
-               on = "<root>";
-       else
-               on = mdoc_macronames[mdoc->last->tok];
-
-       /* FIXME: put this into util.c. */
-       switch (mdoc->last->type) {
-       case (MDOC_TEXT):
-               ot = "text";
-               break;
-       case (MDOC_BODY):
-               ot = "body";
-               break;
-       case (MDOC_ELEM):
-               ot = "elem";
-               break;
-       case (MDOC_HEAD):
-               ot = "head";
-               break;
-       case (MDOC_TAIL):
-               ot = "tail";
-               break;
-       case (MDOC_BLOCK):
-               ot = "block";
-               break;
-       case (MDOC_ROOT):
-               ot = "root";
-               break;
-       default:
-               abort();
-               /* NOTREACHED */
-       }
-

        switch (mdoc->next) {
        case (MDOC_NEXT_SIBLING):
                mdoc->last->next = p;
                p->prev = mdoc->last;
                p->parent = mdoc->last->parent;
        switch (mdoc->next) {
        case (MDOC_NEXT_SIBLING):
                mdoc->last->next = p;
                p->prev = mdoc->last;
                p->parent = mdoc->last->parent;

-               act = "sibling";

                break;
        case (MDOC_NEXT_CHILD):
                mdoc->last->child = p;
                p->parent = mdoc->last;
                break;
        case (MDOC_NEXT_CHILD):
                mdoc->last->child = p;
                p->parent = mdoc->last;

-               act = "child";

                break;
        default:
                abort();
                break;
        default:
                abort();


@@ -453,32 +285,41 @@ mdoc_node_append(struct mdoc *mdoc, struct mdoc_node *p)
 
        if ( ! mdoc_valid_pre(mdoc, p))
                return(0);
 
        if ( ! mdoc_valid_pre(mdoc, p))
                return(0);

-       if ( ! mdoc_action_pre(mdoc, p))
-               return(0);

 
        switch (p->type) {
        case (MDOC_HEAD):
                assert(MDOC_BLOCK == p->parent->type);
 
        switch (p->type) {
        case (MDOC_HEAD):
                assert(MDOC_BLOCK == p->parent->type);

-               p->parent->data.block.head = p;
+               p->parent->head = p;

                break;
        case (MDOC_TAIL):
                assert(MDOC_BLOCK == p->parent->type);
                break;
        case (MDOC_TAIL):
                assert(MDOC_BLOCK == p->parent->type);

-               p->parent->data.block.tail = p;
+               p->parent->tail = p;

                break;
        case (MDOC_BODY):
                assert(MDOC_BLOCK == p->parent->type);
                break;
        case (MDOC_BODY):
                assert(MDOC_BLOCK == p->parent->type);

-               p->parent->data.block.body = p;
+               p->parent->body = p;

                break;
        default:
                break;
        }
 
        mdoc->last = p;
                break;
        default:
                break;
        }
 
        mdoc->last = p;

-       mdoc_msg(mdoc, "parse: %s of %s `%s'", act, ot, on);

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

+static struct mdoc_node *
+mdoc_node_alloc(const struct mdoc *mdoc)
+{
+       struct mdoc_node *p;
+
+       p = xcalloc(1, sizeof(struct mdoc_node));
+       p->sec = mdoc->lastsec;
+
+       return(p);
+}
+
+

 int
 mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, int tok)
 {
 int
 mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, int tok)
 {


@@ -487,7 +328,7 @@ mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, int tok)
        assert(mdoc->first);
        assert(mdoc->last);
 
        assert(mdoc->first);
        assert(mdoc->last);
 

-       p = xcalloc(1, sizeof(struct mdoc_node));
+       p = mdoc_node_alloc(mdoc);

 
        p->line = line;
        p->pos = pos;
 
        p->line = line;
        p->pos = pos;


@@ -506,7 +347,7 @@ mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, int tok)
        assert(mdoc->first);
        assert(mdoc->last);
 
        assert(mdoc->first);
        assert(mdoc->last);
 

-       p = xcalloc(1, sizeof(struct mdoc_node));
+       p = mdoc_node_alloc(mdoc);

 
        p->line = line;
        p->pos = pos;
 
        p->line = line;
        p->pos = pos;


@@ -525,7 +366,7 @@ mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, int tok)
        assert(mdoc->first);
        assert(mdoc->last);
 
        assert(mdoc->first);
        assert(mdoc->last);
 

-       p = xcalloc(1, sizeof(struct mdoc_node));
+       p = mdoc_node_alloc(mdoc);

 
        p->line = line;
        p->pos = pos;
 
        p->line = line;
        p->pos = pos;


@@ -541,7 +382,7 @@ mdoc_root_alloc(struct mdoc *mdoc)
 {
        struct mdoc_node *p;
 
 {
        struct mdoc_node *p;
 

-       p = xcalloc(1, sizeof(struct mdoc_node));
+       p = mdoc_node_alloc(mdoc);

 
        p->type = MDOC_ROOT;
 
 
        p->type = MDOC_ROOT;
 


@@ -551,18 +392,20 @@ mdoc_root_alloc(struct mdoc *mdoc)
 
 int
 mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, 
 
 int
 mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, 

-               int tok, size_t argsz, const struct mdoc_arg *args)
+               int tok, struct mdoc_arg *args)

 {
        struct mdoc_node *p;
 
 {
        struct mdoc_node *p;
 

-       p = xcalloc(1, sizeof(struct mdoc_node));
+       p = mdoc_node_alloc(mdoc);

 
        p->pos = pos;
        p->line = line;
        p->type = MDOC_BLOCK;
        p->tok = tok;
 
        p->pos = pos;
        p->line = line;
        p->type = MDOC_BLOCK;
        p->tok = tok;

-       p->data.block.argc = argsz;
-       p->data.block.argv = argdup(argsz, args);
+       p->args = args;
+
+       if (args)
+               (args->refcnt)++;

 
        return(mdoc_node_append(mdoc, p));
 }
 
        return(mdoc_node_append(mdoc, p));
 }


@@ -570,18 +413,20 @@ mdoc_block_alloc(struct mdoc *mdoc, int line, int pos,
 
 int
 mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, 
 
 int
 mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, 

-               int tok, size_t argsz, const struct mdoc_arg *args)
+               int tok, struct mdoc_arg *args)

 {
        struct mdoc_node *p;
 
 {
        struct mdoc_node *p;
 

-       p = xcalloc(1, sizeof(struct mdoc_node));
+       p = mdoc_node_alloc(mdoc);

 
        p->line = line;
        p->pos = pos;
        p->type = MDOC_ELEM;
        p->tok = tok;
 
        p->line = line;
        p->pos = pos;
        p->type = MDOC_ELEM;
        p->tok = tok;

-       p->data.elem.argc = argsz;
-       p->data.elem.argv = argdup(argsz, args);
+       p->args = args;
+
+       if (args)
+               (args->refcnt)++;

 
        return(mdoc_node_append(mdoc, p));
 }
 
        return(mdoc_node_append(mdoc, p));
 }


@@ -593,135 +438,116 @@ mdoc_word_alloc(struct mdoc *mdoc,
 {
        struct mdoc_node *p;
 
 {
        struct mdoc_node *p;
 

-       p = xcalloc(1, sizeof(struct mdoc_node));
+       p = mdoc_node_alloc(mdoc);
+

        p->line = line;
        p->pos = pos;
        p->type = MDOC_TEXT;
        p->line = line;
        p->pos = pos;
        p->type = MDOC_TEXT;

-       p->data.text.string = xstrdup(word);
+       p->string = xstrdup(word);

 
        return(mdoc_node_append(mdoc, p));
 }
 
 
 
        return(mdoc_node_append(mdoc, p));
 }
 
 

-static void
-argfree(size_t sz, struct mdoc_arg *p)
+void
+mdoc_node_free(struct mdoc_node *p)

 {
 {

-       int              i, j;

 
 

-       if (0 == sz)
-               return;
-
-       assert(p);
-       /* LINTED */
-       for (i = 0; i < (int)sz; i++)
-               if (p[i].sz > 0) {
-                       assert(p[i].value);
-                       /* LINTED */
-                       for (j = 0; j < (int)p[i].sz; j++)
-                               free(p[i].value[j]);
-                       free(p[i].value);
-               }
+       if (p->string)
+               free(p->string);
+       if (p->args)
+               mdoc_argv_free(p->args);

        free(p);
 }
 
 
        free(p);
 }
 
 

-static void
-mdoc_elem_free(struct mdoc_elem *p)
+void
+mdoc_node_freelist(struct mdoc_node *p)

 {
 
 {
 

-       argfree(p->argc, p->argv);
-}
-
-
-static void
-mdoc_block_free(struct mdoc_block *p)
-{
+       if (p->child)
+               mdoc_node_freelist(p->child);
+       if (p->next)
+               mdoc_node_freelist(p->next);

 
 

-       argfree(p->argc, p->argv);
+       mdoc_node_free(p);

 }
 
 
 }
 
 

-static void
-mdoc_text_free(struct mdoc_text *p)
+/*
+ * Parse free-form text, that is, a line that does not begin with the
+ * control character.
+ */
+static int
+parsetext(struct mdoc *mdoc, int line, char *buf)

 {
 
 {
 

-       if (p->string)
-               free(p->string);
-}
-
+       if (SEC_PROLOGUE == mdoc->lastnamed)
+               return(mdoc_perr(mdoc, line, 0,
+                       "text disallowed in prologue"));

 
 

-void
-mdoc_node_free(struct mdoc_node *p)
-{
-
-       switch (p->type) {
-       case (MDOC_TEXT):
-               mdoc_text_free(&p->data.text);
-               break;
-       case (MDOC_ELEM):
-               mdoc_elem_free(&p->data.elem);
-               break;
-       case (MDOC_BLOCK):
-               mdoc_block_free(&p->data.block);
-               break;
-       default:
-               break;
-       }
+       if ( ! mdoc_word_alloc(mdoc, line, 0, buf))
+               return(0);

 
 

-       free(p);
+       mdoc->next = MDOC_NEXT_SIBLING;
+       return(1);

 }
 
 
 }
 
 

-static void
-mdoc_node_freelist(struct mdoc_node *p)
+/*
+ * Parse a macro line, that is, a line beginning with the control
+ * character.
+ */
+int
+parsemacro(struct mdoc *m, int ln, char *buf)

 {
 {

+       int               i, c;
+       char              mac[5];

 
 

-       if (p->child)
-               mdoc_node_freelist(p->child);
-       if (p->next)
-               mdoc_node_freelist(p->next);
+       /* Comments are quickly ignored. */

 
 

-       mdoc_node_free(p);
-}
+       if (buf[1] && '\\' == buf[1])
+               if (buf[2] && '\"' == buf[2])
+                       return(1);

 
 

+       /* Copy the first word into a nil-terminated buffer. */

 
 

-int
-mdoc_find(const struct mdoc *mdoc, const char *key)
-{
+       for (i = 1; i < 5; i++) {
+               if (0 == (mac[i - 1] = buf[i]))
+                       break;
+               else if (isspace((unsigned char)buf[i]))
+                       break;
+       }

 
 

-       return(mdoc_tokhash_find(mdoc->htab, key));
-}
+       /* FIXME: be able to skip unknown macro lines! */

 
 

+       mac[i - 1] = 0;

 
 

-static void
-argcpy(struct mdoc_arg *dst, const struct mdoc_arg *src)
-{
-       int              i;
+       if (i == 5 || i <= 2) {
+               (void)mdoc_perr(m, ln, 1, "unknown macro: %s%s", 
+                               mac, i == 5 ? "..." : "");
+               goto err;
+       } 
+       
+       if (MDOC_MAX == (c = mdoc_tokhash_find(m->htab, mac))) {
+               (void)mdoc_perr(m, ln, 1, "unknown macro: %s", mac);
+               goto err;
+       }

 
 

-       dst->line = src->line;
-       dst->pos = src->pos;
-       dst->arg = src->arg;
-       if (0 == (dst->sz = src->sz))
-               return;
-       dst->value = xcalloc(dst->sz, sizeof(char *));
-       for (i = 0; i < (int)dst->sz; i++)
-               dst->value[i] = xstrdup(src->value[i]);
-}
+       /* The macro is sane.  Jump to the next word. */

 
 

+       while (buf[i] && isspace((unsigned char)buf[i]))
+               i++;

 
 

-static struct mdoc_arg *
-argdup(size_t argsz, const struct mdoc_arg *args)
-{
-       struct mdoc_arg *pp;
-       int              i;
+       /* Begin recursive parse sequence. */
+
+       if ( ! mdoc_macro(m, c, ln, 1, &i, buf)) 
+               goto err;

 
 

-       if (0 == argsz)
-               return(NULL);
+       return(1);

 
 

-       pp = xcalloc((size_t)argsz, sizeof(struct mdoc_arg));
-       for (i = 0; i < (int)argsz; i++)
-               argcpy(&pp[i], &args[i]);
+err:   /* Error out. */

 
 

-       return(pp);
+       m->flags |= MDOC_HALT;
+       return(0);

 }
 }

-