Sync to OpenBSD:

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index b0f47e04bbf20e7d4f3deca0dc2c2080e40c3d86..8e46ff4995c148d3b0932a7e6947c6f90b528336 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.167 2010/12/01 16:38:57 kristaps Exp $ */
+/*     $Id: mdoc.c,v 1.170 2010/12/16 17:14:48 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -526,6 +526,9 @@ mdoc_node_free(struct mdoc_node *p)
        if (MDOC_Bf == p->tok && MDOC_HEAD == p->type)
                if (p->data.Bf)
                        free(p->data.Bf);
+       if (MDOC_An == p->tok)
+               if (p->data.An)
+                       free(p->data.An);
 
        if (p->string)
                free(p->string);
@@ -552,6 +555,8 @@ mdoc_node_unlink(struct mdoc *m, struct mdoc_node *n)
                n->parent->nchild--;
                if (n->parent->child == n)
                        n->parent->child = n->prev ? n->prev : n->next;
+               if (n->parent->last == n)
+                       n->parent->last = n->prev ? n->prev : NULL;
        }
 
        /* Adjust parse point, if applicable. */
@@ -766,9 +771,7 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
 
        tok = (j > 1 || j < 4) ? mdoc_hash_find(mac) : MDOC_MAX;
        if (MDOC_MAX == tok) {
-               mdoc_vmsg(m, MANDOCERR_MACRO, ln, sv, 
-                   "unknown macro: %s%s", 
-                   buf, strlen(buf) > 3 ? "..." : "");
+               mdoc_vmsg(m, MANDOCERR_MACRO, ln, sv, "%s", buf + sv - 1);
                return(1);
        }