The files mandoc.c and mandoc.h contained both specialised low-level

[mandoc.git] / man.c

diff --git a/man.c b/man.c
index 72c6afab6f80d6c40302736faf8dc3dab2627e3f..113c72dac8fb559fe9a106fb52eb83a08812e17d 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,6 +1,8 @@
-/*     $Id: man.c,v 1.122 2013/12/31 23:23:10 schwarze Exp $ */
+/*     $Id: man.c,v 1.125 2014/03/23 11:25:26 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011 Joerg Sonnenberger <joerg@netbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -28,6 +30,7 @@
 
 #include "man.h"
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "libman.h"
 #include "libmandoc.h"
 
@@ -97,7 +100,7 @@ man_free(struct man *man)
 
 
 struct man *
-man_alloc(struct roff *roff, struct mparse *parse)
+man_alloc(struct roff *roff, struct mparse *parse, int quick)
 {
        struct man      *p;
 
@@ -105,6 +108,7 @@ man_alloc(struct roff *roff, struct mparse *parse)
 
        man_hash_init();
        p->parse = parse;
+       p->quick = quick;
        p->roff = roff;
 
        man_alloc1(p);
@@ -604,6 +608,12 @@ man_pmacro(struct man *man, int ln, char *buf, int offs)
        if ( ! (*man_macros[tok].fp)(man, tok, ln, ppos, &offs, buf))
                goto err;
 
+       /* In quick mode (for mandocdb), abort after the NAME section. */
+
+       if (man->quick && MAN_SH == tok &&
+           strcmp(man->last->prev->child->string, "NAME"))
+               return(2);
+
        /* 
         * We weren't in a block-line scope when entering the
         * above-parsed macro, so return.