fix unchecked snprintf(3) in page header printing:

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index 228728fccf9986c9fe066d3525b22da6cf00ecd6..168778177c42dca0cb4f2daf2795ac245debcc29 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,7 +1,7 @@
-/*     $Id: mdoc.c,v 1.205 2013/10/21 23:47:58 schwarze Exp $ */
+/*     $Id: mdoc.c,v 1.213 2014/04/20 16:46:05 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2010, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -22,6 +22,7 @@
 #include <sys/types.h>
 
 #include <assert.h>
 #include <sys/types.h>
 
 #include <assert.h>

+#include <ctype.h>

 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>


@@ -30,10 +31,11 @@
 
 #include "mdoc.h"
 #include "mandoc.h"
 
 #include "mdoc.h"
 #include "mandoc.h"

+#include "mandoc_aux.h"

 #include "libmdoc.h"
 #include "libmandoc.h"
 
 #include "libmdoc.h"
 #include "libmandoc.h"
 

-const  char *const __mdoc_macronames[MDOC_MAX] = {              
+const  char *const __mdoc_macronames[MDOC_MAX] = {

        "Ap",           "Dd",           "Dt",           "Os",
        "Sh",           "Ss",           "Pp",           "D1",
        "Dl",           "Bd",           "Ed",           "Bl",
        "Ap",           "Dd",           "Dt",           "Os",
        "Sh",           "Ss",           "Pp",           "D1",
        "Dl",           "Bd",           "Ed",           "Bl",


@@ -44,11 +46,8 @@ const        char *const __mdoc_macronames[MDOC_MAX] = {
        "Ic",           "In",           "Li",           "Nd",
        "Nm",           "Op",           "Ot",           "Pa",
        "Rv",           "St",           "Va",           "Vt",
        "Ic",           "In",           "Li",           "Nd",
        "Nm",           "Op",           "Ot",           "Pa",
        "Rv",           "St",           "Va",           "Vt",

-       /* LINTED */

        "Xr",           "%A",           "%B",           "%D",
        "Xr",           "%A",           "%B",           "%D",

-       /* LINTED */

        "%I",           "%J",           "%N",           "%O",
        "%I",           "%J",           "%N",           "%O",

-       /* LINTED */

        "%P",           "%R",           "%T",           "%V",
        "Ac",           "Ao",           "Aq",           "At",
        "Bc",           "Bf",           "Bo",           "Bq",
        "%P",           "%R",           "%T",           "%V",
        "Ac",           "Ao",           "Aq",           "At",
        "Bc",           "Bf",           "Bo",           "Bq",


@@ -65,22 +64,19 @@ const       char *const __mdoc_macronames[MDOC_MAX] = {
        "Bk",           "Ek",           "Bt",           "Hf",
        "Fr",           "Ud",           "Lb",           "Lp",
        "Lk",           "Mt",           "Brq",          "Bro",
        "Bk",           "Ek",           "Bt",           "Hf",
        "Fr",           "Ud",           "Lb",           "Lp",
        "Lk",           "Mt",           "Brq",          "Bro",

-       /* LINTED */

        "Brc",          "%C",           "Es",           "En",
        "Brc",          "%C",           "Es",           "En",

-       /* LINTED */

        "Dx",           "%Q",           "br",           "sp",
        "Dx",           "%Q",           "br",           "sp",

-       /* LINTED */
-       "%U",           "Ta"
+       "%U",           "Ta",           "ll",

        };
 
        };
 

-const  char *const __mdoc_argnames[MDOC_ARG_MAX] = {            
+const  char *const __mdoc_argnames[MDOC_ARG_MAX] = {

        "split",                "nosplit",              "ragged",
        "split",                "nosplit",              "ragged",

-       "unfilled",             "literal",              "file",          
-       "offset",               "bullet",               "dash",          
-       "hyphen",               "item",                 "enum",          
-       "tag",                  "diag",                 "hang",          
-       "ohang",                "inset",                "column",        
-       "width",                "compact",              "std",   
+       "unfilled",             "literal",              "file",
+       "offset",               "bullet",               "dash",
+       "hyphen",               "item",                 "enum",
+       "tag",                  "diag",                 "hang",
+       "ohang",                "inset",                "column",
+       "width",                "compact",              "std",

        "filled",               "words",                "emphasis",
        "symbolic",             "nested",               "centered"
        };
        "filled",               "words",                "emphasis",
        "symbolic",             "nested",               "centered"
        };


@@ -89,13 +85,13 @@ const       char * const *mdoc_macronames = __mdoc_macronames;
 const  char * const *mdoc_argnames = __mdoc_argnames;
 
 static void              mdoc_node_free(struct mdoc_node *);
 const  char * const *mdoc_argnames = __mdoc_argnames;
 
 static void              mdoc_node_free(struct mdoc_node *);

-static void              mdoc_node_unlink(struct mdoc *, 
+static void              mdoc_node_unlink(struct mdoc *,

                                struct mdoc_node *);
 static void              mdoc_free1(struct mdoc *);
 static void              mdoc_alloc1(struct mdoc *);
                                struct mdoc_node *);
 static void              mdoc_free1(struct mdoc *);
 static void              mdoc_alloc1(struct mdoc *);

-static struct mdoc_node *node_alloc(struct mdoc *, int, int, 
+static struct mdoc_node *node_alloc(struct mdoc *, int, int,

                                enum mdoct, enum mdoc_type);
                                enum mdoct, enum mdoc_type);

-static int               node_append(struct mdoc *, 
+static int               node_append(struct mdoc *,

                                struct mdoc_node *);
 #if 0
 static int               mdoc_preptext(struct mdoc *, int, char *, int);
                                struct mdoc_node *);
 #if 0
 static int               mdoc_preptext(struct mdoc *, int, char *, int);


@@ -103,6 +99,7 @@ static       int               mdoc_preptext(struct mdoc *, int, char *, int);
 static int               mdoc_ptext(struct mdoc *, int, char *, int);
 static int               mdoc_pmacro(struct mdoc *, int, char *, int);
 
 static int               mdoc_ptext(struct mdoc *, int, char *, int);
 static int               mdoc_pmacro(struct mdoc *, int, char *, int);
 

+

 const struct mdoc_node *
 mdoc_node(const struct mdoc *mdoc)
 {
 const struct mdoc_node *
 mdoc_node(const struct mdoc *mdoc)
 {


@@ -111,7 +108,6 @@ mdoc_node(const struct mdoc *mdoc)
        return(mdoc->first);
 }
 
        return(mdoc->first);
 }
 

-

 const struct mdoc_meta *
 mdoc_meta(const struct mdoc *mdoc)
 {
 const struct mdoc_meta *
 mdoc_meta(const struct mdoc *mdoc)
 {


@@ -120,7 +116,6 @@ mdoc_meta(const struct mdoc *mdoc)
        return(&mdoc->meta);
 }
 
        return(&mdoc->meta);
 }
 

-

 /*
  * Frees volatile resources (parse tree, meta-data, fields).
  */
 /*
  * Frees volatile resources (parse tree, meta-data, fields).
  */


@@ -146,7 +141,6 @@ mdoc_free1(struct mdoc *mdoc)
                free(mdoc->meta.date);
 }
 
                free(mdoc->meta.date);
 }
 

-

 /*
  * Allocate all volatile resources (parse tree, meta-data, fields).
  */
 /*
  * Allocate all volatile resources (parse tree, meta-data, fields).
  */


@@ -164,7 +158,6 @@ mdoc_alloc1(struct mdoc *mdoc)
        mdoc->next = MDOC_NEXT_CHILD;
 }
 
        mdoc->next = MDOC_NEXT_CHILD;
 }
 

-

 /*
  * Free up volatile resources (see mdoc_free1()) then re-initialises the
  * data with mdoc_alloc1().  After invocation, parse data has been reset
 /*
  * Free up volatile resources (see mdoc_free1()) then re-initialises the
  * data with mdoc_alloc1().  After invocation, parse data has been reset


@@ -179,7 +172,6 @@ mdoc_reset(struct mdoc *mdoc)
        mdoc_alloc1(mdoc);
 }
 
        mdoc_alloc1(mdoc);
 }
 

-

 /*
  * Completely free up all volatile and non-volatile parse resources.
  * After invocation, the pointer is no longer usable.
 /*
  * Completely free up all volatile and non-volatile parse resources.
  * After invocation, the pointer is no longer usable.


@@ -192,12 +184,12 @@ mdoc_free(struct mdoc *mdoc)
        free(mdoc);
 }
 
        free(mdoc);
 }
 

-

 /*
 /*

- * Allocate volatile and non-volatile parse resources.  
+ * Allocate volatile and non-volatile parse resources.

  */
 struct mdoc *
  */
 struct mdoc *

-mdoc_alloc(struct roff *roff, struct mparse *parse, char *defos)
+mdoc_alloc(struct roff *roff, struct mparse *parse,
+       char *defos, int quick)

 {
        struct mdoc     *p;
 
 {
        struct mdoc     *p;
 


@@ -205,6 +197,7 @@ mdoc_alloc(struct roff *roff, struct mparse *parse, char *defos)
 
        p->parse = parse;
        p->defos = defos;
 
        p->parse = parse;
        p->defos = defos;

+       p->quick = quick;

        p->roff = roff;
 
        mdoc_hash_init();
        p->roff = roff;
 
        mdoc_hash_init();


@@ -212,7 +205,6 @@ mdoc_alloc(struct roff *roff, struct mparse *parse, char *defos)
        return(p);
 }
 
        return(p);
 }
 

-

 /*
  * Climb back up the parse tree, validating open scopes.  Mostly calls
  * through to macro_end() in macro.c.
 /*
  * Climb back up the parse tree, validating open scopes.  Mostly calls
  * through to macro_end() in macro.c.


@@ -276,7 +268,6 @@ mdoc_addspan(struct mdoc *mdoc, const struct tbl_span *sp)
        return(1);
 }
 
        return(1);
 }
 

-

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


@@ -301,8 +292,8 @@ mdoc_parseln(struct mdoc *mdoc, int ln, char *buf, int offs)
                mdoc->flags &= ~MDOC_SYNOPSIS;
 
        return(roff_getcontrol(mdoc->roff, buf, &offs) ?
                mdoc->flags &= ~MDOC_SYNOPSIS;
 
        return(roff_getcontrol(mdoc->roff, buf, &offs) ?

-                       mdoc_pmacro(mdoc, ln, buf, offs) :
-                       mdoc_ptext(mdoc, ln, buf, offs));
+           mdoc_pmacro(mdoc, ln, buf, offs) :
+           mdoc_ptext(mdoc, ln, buf, offs));

 }
 
 int
 }
 
 int


@@ -312,16 +303,16 @@ mdoc_macro(MACRO_PROT_ARGS)
 
        /* If we're in the body, deny prologue calls. */
 
 
        /* If we're in the body, deny prologue calls. */
 

-       if (MDOC_PROLOGUE & mdoc_macros[tok].flags && 
-                       MDOC_PBODY & mdoc->flags) {
+       if (MDOC_PROLOGUE & mdoc_macros[tok].flags &&
+           MDOC_PBODY & mdoc->flags) {

                mdoc_pmsg(mdoc, line, ppos, MANDOCERR_BADBODY);
                return(1);
        }
 
        /* If we're in the prologue, deny "body" macros.  */
 
                mdoc_pmsg(mdoc, line, ppos, MANDOCERR_BADBODY);
                return(1);
        }
 
        /* If we're in the prologue, deny "body" macros.  */
 

-       if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && 
-                       ! (MDOC_PBODY & mdoc->flags)) {
+       if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) &&
+            ! (MDOC_PBODY & mdoc->flags)) {

                mdoc_pmsg(mdoc, line, ppos, MANDOCERR_BADPROLOG);
                if (NULL == mdoc->meta.msec)
                        mdoc->meta.msec = mandoc_strdup("1");
                mdoc_pmsg(mdoc, line, ppos, MANDOCERR_BADPROLOG);
                if (NULL == mdoc->meta.msec)
                        mdoc->meta.msec = mandoc_strdup("1");


@@ -350,12 +341,12 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
        assert(MDOC_ROOT != p->type);
 
        switch (mdoc->next) {
        assert(MDOC_ROOT != p->type);
 
        switch (mdoc->next) {

-       case (MDOC_NEXT_SIBLING):
+       case MDOC_NEXT_SIBLING:

                mdoc->last->next = p;
                p->prev = mdoc->last;
                p->parent = mdoc->last->parent;
                break;
                mdoc->last->next = p;
                p->prev = mdoc->last;
                p->parent = mdoc->last->parent;
                break;

-       case (MDOC_NEXT_CHILD):
+       case MDOC_NEXT_CHILD:

                mdoc->last->child = p;
                p->parent = mdoc->last;
                break;
                mdoc->last->child = p;
                p->parent = mdoc->last;
                break;


@@ -372,13 +363,13 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
         */
 
        switch (p->type) {
         */
 
        switch (p->type) {

-       case (MDOC_BODY):
+       case MDOC_BODY:

                if (ENDBODY_NOT != p->end)
                        break;
                /* FALLTHROUGH */
                if (ENDBODY_NOT != p->end)
                        break;
                /* FALLTHROUGH */

-       case (MDOC_TAIL):
+       case MDOC_TAIL:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_HEAD):
+       case MDOC_HEAD:

                p->norm = p->parent->norm;
                break;
        default:
                p->norm = p->parent->norm;
                break;
        default:


@@ -389,15 +380,15 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
                return(0);
 
        switch (p->type) {
                return(0);
 
        switch (p->type) {

-       case (MDOC_HEAD):
+       case MDOC_HEAD:

                assert(MDOC_BLOCK == p->parent->type);
                p->parent->head = p;
                break;
                assert(MDOC_BLOCK == p->parent->type);
                p->parent->head = p;
                break;

-       case (MDOC_TAIL):
+       case MDOC_TAIL:

                assert(MDOC_BLOCK == p->parent->type);
                p->parent->tail = p;
                break;
                assert(MDOC_BLOCK == p->parent->type);
                p->parent->tail = p;
                break;

-       case (MDOC_BODY):
+       case MDOC_BODY:

                if (p->end)
                        break;
                assert(MDOC_BLOCK == p->parent->type);
                if (p->end)
                        break;
                assert(MDOC_BLOCK == p->parent->type);


@@ -410,9 +401,9 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
        mdoc->last = p;
 
        switch (p->type) {
        mdoc->last = p;
 
        switch (p->type) {

-       case (MDOC_TBL):
+       case MDOC_TBL:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_TEXT):
+       case MDOC_TEXT:

                if ( ! mdoc_valid_post(mdoc))
                        return(0);
                break;
                if ( ! mdoc_valid_post(mdoc))
                        return(0);
                break;


@@ -423,9 +414,8 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
        return(1);
 }
 
        return(1);
 }
 

-

 static struct mdoc_node *
 static struct mdoc_node *

-node_alloc(struct mdoc *mdoc, int line, int pos, 
+node_alloc(struct mdoc *mdoc, int line, int pos,

                enum mdoct tok, enum mdoc_type type)
 {
        struct mdoc_node *p;
                enum mdoct tok, enum mdoc_type type)
 {
        struct mdoc_node *p;


@@ -434,6 +424,7 @@ node_alloc(struct mdoc *mdoc, int line, int pos,
        p->sec = mdoc->lastsec;
        p->line = line;
        p->pos = pos;
        p->sec = mdoc->lastsec;
        p->line = line;
        p->pos = pos;

+       p->lastline = line;

        p->tok = tok;
        p->type = type;
 
        p->tok = tok;
        p->type = type;
 


@@ -450,7 +441,6 @@ node_alloc(struct mdoc *mdoc, int line, int pos,
        return(p);
 }
 
        return(p);
 }
 

-

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


@@ -463,7 +453,6 @@ mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok)
        return(1);
 }
 
        return(1);
 }
 

-

 int
 mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok)
 {
 int
 mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok)
 {


@@ -479,7 +468,6 @@ mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok)
        return(1);
 }
 
        return(1);
 }
 

-

 int
 mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok)
 {
 int
 mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok)
 {


@@ -492,7 +480,6 @@ mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok)
        return(1);
 }
 
        return(1);
 }
 

-

 int
 mdoc_endbody_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok,
                struct mdoc_node *body, enum mdoc_endbody end)
 int
 mdoc_endbody_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok,
                struct mdoc_node *body, enum mdoc_endbody end)


@@ -509,9 +496,8 @@ mdoc_endbody_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok,
        return(1);
 }
 
        return(1);
 }
 

-

 int
 int

-mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, 
+mdoc_block_alloc(struct mdoc *mdoc, int line, int pos,

                enum mdoct tok, struct mdoc_arg *args)
 {
        struct mdoc_node *p;
                enum mdoct tok, struct mdoc_arg *args)
 {
        struct mdoc_node *p;


@@ -522,13 +508,13 @@ mdoc_block_alloc(struct mdoc *mdoc, int line, int pos,
                (args->refcnt)++;
 
        switch (tok) {
                (args->refcnt)++;
 
        switch (tok) {

-       case (MDOC_Bd):
+       case MDOC_Bd:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Bf):
+       case MDOC_Bf:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Bl):
+       case MDOC_Bl:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Rs):
+       case MDOC_Rs:

                p->norm = mandoc_calloc(1, sizeof(union mdoc_data));
                break;
        default:
                p->norm = mandoc_calloc(1, sizeof(union mdoc_data));
                break;
        default:


@@ -541,9 +527,8 @@ mdoc_block_alloc(struct mdoc *mdoc, int line, int pos,
        return(1);
 }
 
        return(1);
 }
 

-

 int
 int

-mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, 
+mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos,

                enum mdoct tok, struct mdoc_arg *args)
 {
        struct mdoc_node *p;
                enum mdoct tok, struct mdoc_arg *args)
 {
        struct mdoc_node *p;


@@ -554,7 +539,7 @@ mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos,
                (args->refcnt)++;
 
        switch (tok) {
                (args->refcnt)++;
 
        switch (tok) {

-       case (MDOC_An):
+       case MDOC_An:

                p->norm = mandoc_calloc(1, sizeof(union mdoc_data));
                break;
        default:
                p->norm = mandoc_calloc(1, sizeof(union mdoc_data));
                break;
        default:


@@ -590,10 +575,7 @@ mdoc_word_append(struct mdoc *mdoc, const char *p)
 
        n = mdoc->last;
        addstr = roff_strdup(mdoc->roff, p);
 
        n = mdoc->last;
        addstr = roff_strdup(mdoc->roff, p);

-       if (-1 == asprintf(&newstr, "%s %s", n->string, addstr)) {
-               perror(NULL);
-               exit((int)MANDOCLEVEL_SYSERR);
-       }
+       mandoc_asprintf(&newstr, "%s %s", n->string, addstr);

        free(addstr);
        free(n->string);
        n->string = newstr;
        free(addstr);
        free(n->string);
        n->string = newstr;


@@ -613,7 +595,6 @@ mdoc_node_free(struct mdoc_node *p)
        free(p);
 }
 
        free(p);
 }
 

-

 static void
 mdoc_node_unlink(struct mdoc *mdoc, struct mdoc_node *n)
 {
 static void
 mdoc_node_unlink(struct mdoc *mdoc, struct mdoc_node *n)
 {


@@ -651,7 +632,6 @@ mdoc_node_unlink(struct mdoc *mdoc, struct mdoc_node *n)
                mdoc->first = NULL;
 }
 
                mdoc->first = NULL;
 }
 

-

 void
 mdoc_node_delete(struct mdoc *mdoc, struct mdoc_node *p)
 {
 void
 mdoc_node_delete(struct mdoc *mdoc, struct mdoc_node *p)
 {


@@ -722,7 +702,7 @@ mdoc_preptext(struct mdoc *mdoc, int line, char *buf, int offs)
                        if ( ! mdoc_addeqn(mdoc, roff_eqn(mdoc->roff)))
                                return(0);
                offs += (end - (buf + offs));
                        if ( ! mdoc_addeqn(mdoc, roff_eqn(mdoc->roff)))
                                return(0);
                offs += (end - (buf + offs));

-       } 
+       }

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


@@ -756,16 +736,16 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int offs)
         */
 
        if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
         */
 
        if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&

-                       LIST_column == n->norm->Bl.type) {
+           LIST_column == n->norm->Bl.type) {

                /* `Bl' is open without any children. */
                mdoc->flags |= MDOC_FREECOL;
                return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf));
        }
 
        if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
                /* `Bl' is open without any children. */
                mdoc->flags |= MDOC_FREECOL;
                return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf));
        }
 
        if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&

-                       NULL != n->parent &&
-                       MDOC_Bl == n->parent->tok &&
-                       LIST_column == n->parent->norm->Bl.type) {
+           NULL != n->parent &&
+           MDOC_Bl == n->parent->tok &&
+           LIST_column == n->parent->norm->Bl.type) {

                /* `Bl' has block-level `It' children. */
                mdoc->flags |= MDOC_FREECOL;
                return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf));
                /* `Bl' has block-level `It' children. */
                mdoc->flags |= MDOC_FREECOL;
                return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf));


@@ -845,13 +825,12 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int offs)
 
        assert(buf < end);
 
 
        assert(buf < end);
 

-       if (mandoc_eos(buf+offs, (size_t)(end-buf-offs), 0))
+       if (mandoc_eos(buf+offs, (size_t)(end-buf-offs)))

                mdoc->last->flags |= MDOC_EOS;
 
        return(1);
 }
 
                mdoc->last->flags |= MDOC_EOS;
 
        return(1);
 }
 

-

 /*
  * Parse a macro line, that is, a line beginning with the control
  * character.
 /*
  * Parse a macro line, that is, a line beginning with the control
  * character.


@@ -874,14 +853,14 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs)
 
        sv = offs;
 
 
        sv = offs;
 

-       /* 
+       /*

         * Copy the first word into a nil-terminated buffer.
         * Stop copying when a tab, space, or eoln is encountered.
         */
 
        i = 0;
         * Copy the first word into a nil-terminated buffer.
         * Stop copying when a tab, space, or eoln is encountered.
         */
 
        i = 0;

-       while (i < 4 && '\0' != buf[offs] && 
-                       ' ' != buf[offs] && '\t' != buf[offs])
+       while (i < 4 && '\0' != buf[offs] && ' ' != buf[offs] &&
+           '\t' != buf[offs])

                mac[i++] = buf[offs++];
 
        mac[i] = '\0';
                mac[i++] = buf[offs++];
 
        mac[i] = '\0';


@@ -889,8 +868,8 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs)
        tok = (i > 1 || i < 4) ? mdoc_hash_find(mac) : MDOC_MAX;
 
        if (MDOC_MAX == tok) {
        tok = (i > 1 || i < 4) ? mdoc_hash_find(mac) : MDOC_MAX;
 
        if (MDOC_MAX == tok) {

-               mandoc_vmsg(MANDOCERR_MACRO, mdoc->parse, 
-                               ln, sv, "%s", buf + sv - 1);
+               mandoc_vmsg(MANDOCERR_MACRO, mdoc->parse,
+                   ln, sv, "%s", buf + sv - 1);

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


@@ -904,7 +883,7 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs)
        while (buf[offs] && ' ' == buf[offs])
                offs++;
 
        while (buf[offs] && ' ' == buf[offs])
                offs++;
 

-       /* 
+       /*

         * Trailing whitespace.  Note that tabs are allowed to be passed
         * into the parser as "text", so we only warn about spaces here.
         */
         * Trailing whitespace.  Note that tabs are allowed to be passed
         * into the parser as "text", so we only warn about spaces here.
         */


@@ -918,7 +897,7 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs)
         */
 
        if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok) {
         */
 
        if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok) {

-               if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf)) 
+               if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf))

                        goto err;
                return(1);
        }
                        goto err;
                return(1);
        }


@@ -932,7 +911,7 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs)
         */
 
        if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
         */
 
        if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&

-                       LIST_column == n->norm->Bl.type) {
+           LIST_column == n->norm->Bl.type) {

                mdoc->flags |= MDOC_FREECOL;
                if ( ! mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf))
                        goto err;
                mdoc->flags |= MDOC_FREECOL;
                if ( ! mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf))
                        goto err;


@@ -946,20 +925,26 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs)
         */
 
        if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
         */
 
        if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&

-                       NULL != n->parent &&
-                       MDOC_Bl == n->parent->tok &&
-                       LIST_column == n->parent->norm->Bl.type) {
+           NULL != n->parent &&
+           MDOC_Bl == n->parent->tok &&
+           LIST_column == n->parent->norm->Bl.type) {

                mdoc->flags |= MDOC_FREECOL;
                mdoc->flags |= MDOC_FREECOL;

-               if ( ! mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf)) 
+               if ( ! mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf))

                        goto err;
                return(1);
        }
 
        /* Normal processing of a macro. */
 
                        goto err;
                return(1);
        }
 
        /* Normal processing of a macro. */
 

-       if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf)) 
+       if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf))

                goto err;
 
                goto err;
 

+       /* In quick mode (for mandocdb), abort after the NAME section. */
+
+       if (mdoc->quick && MDOC_Sh == tok &&
+           SEC_NAME != mdoc->last->sec)
+               return(2);
+

        return(1);
 
 err:   /* Error out. */
        return(1);
 
 err:   /* Error out. */


@@ -977,27 +962,27 @@ mdoc_isdelim(const char *p)
 
        if ('\0' == p[1])
                switch (p[0]) {
 
        if ('\0' == p[1])
                switch (p[0]) {

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

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

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

                        return(DELIM_OPEN);
                        return(DELIM_OPEN);

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

                        return(DELIM_MIDDLE);
                        return(DELIM_MIDDLE);

-               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 ')':

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

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

                        return(DELIM_CLOSE);
                default:
                        return(DELIM_NONE);
                        return(DELIM_CLOSE);
                default:
                        return(DELIM_NONE);


@@ -1013,3 +998,42 @@ mdoc_isdelim(const char *p)
 
        return(DELIM_NONE);
 }
 
        return(DELIM_NONE);
 }

+
+void
+mdoc_deroff(char **dest, const struct mdoc_node *n)
+{
+       char    *cp;
+       size_t   sz;
+
+       if (MDOC_TEXT != n->type) {
+               for (n = n->child; n; n = n->next)
+                       mdoc_deroff(dest, n);
+               return;
+       }
+
+       /* Skip leading whitespace. */
+
+       for (cp = n->string; '\0' != *cp; cp++)
+               if (0 == isspace((unsigned char)*cp))
+                       break;
+
+       /* Skip trailing whitespace. */
+
+       for (sz = strlen(cp); sz; sz--)
+               if (0 == isspace((unsigned char)cp[sz-1]))
+                       break;
+
+       /* Skip empty strings. */
+
+       if (0 == sz)
+               return;
+
+       if (NULL == *dest) {
+               *dest = mandoc_strndup(cp, sz);
+               return;
+       }
+
+       mandoc_asprintf(&cp, "%s %*s", *dest, (int)sz, cp);
+       free(*dest);
+       *dest = cp;
+}