If no output device was allocated because no file wanted to produce output,

[mandoc.git] / read.c

diff --git a/read.c b/read.c
index ba69342cb982da4ad20bd7af96c071c95752522f..13b25778d740e1f365907736ed8ea30574b1d30d 100644 (file)
--- a/read.c
+++ b/read.c
@@ -1,4 +1,4 @@
-/*     $Id: read.c,v 1.121 2015/02/04 16:38:56 schwarze Exp $ */
+/*     $Id: read.c,v 1.144 2015/10/13 22:59:54 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>


@@ -8,9 +8,9 @@
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES

  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR

  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF


@@ -23,10 +23,10 @@
 #include <sys/mman.h>
 #include <sys/stat.h>
 #endif
 #include <sys/mman.h>
 #include <sys/stat.h>
 #endif

-#include <sys/wait.h>

 
 #include <assert.h>
 #include <ctype.h>
 
 #include <assert.h>
 #include <ctype.h>

+#include <err.h>

 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>


@@ -35,22 +35,21 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

+#include <zlib.h>

 
 

-#include "mandoc.h"

 #include "mandoc_aux.h"
 #include "mandoc_aux.h"

-#include "libmandoc.h"
+#include "mandoc.h"
+#include "roff.h"

 #include "mdoc.h"
 #include "man.h"
 #include "mdoc.h"
 #include "man.h"

+#include "libmandoc.h"
+#include "roff_int.h"

 
 #define        REPARSE_LIMIT   1000
 
 struct mparse {
 
 #define        REPARSE_LIMIT   1000
 
 struct mparse {

-       struct man       *pman; /* persistent man parser */
-       struct mdoc      *pmdoc; /* persistent mdoc parser */
-       struct man       *man; /* man parser */
-       struct mdoc      *mdoc; /* mdoc parser */
+       struct roff_man  *man; /* man parser */

        struct roff      *roff; /* roff parser (!NULL) */
        struct roff      *roff; /* roff parser (!NULL) */

-       const struct mchars *mchars; /* character table */

        char             *sodest; /* filename pointed to by .so */
        const char       *file; /* filename of current input file */
        struct buf       *primary; /* buffer currently being parsed */
        char             *sodest; /* filename pointed to by .so */
        const char       *file; /* filename of current input file */
        struct buf       *primary; /* buffer currently being parsed */


@@ -60,10 +59,10 @@ struct      mparse {
        enum mandoclevel  file_status; /* status of current parse */
        enum mandoclevel  wlevel; /* ignore messages below this */
        int               options; /* parser options */
        enum mandoclevel  file_status; /* status of current parse */
        enum mandoclevel  wlevel; /* ignore messages below this */
        int               options; /* parser options */

+       int               gzip; /* current input file is gzipped */

        int               filenc; /* encoding of the current file */
        int               reparse_count; /* finite interp. stack */
        int               line; /* line number in the file */
        int               filenc; /* encoding of the current file */
        int               reparse_count; /* finite interp. stack */
        int               line; /* line number in the file */

-       pid_t             child; /* the gunzip(1) process */

 };
 
 static void      choose_parser(struct mparse *);
 };
 
 static void      choose_parser(struct mparse *);


@@ -109,7 +108,10 @@ static     const char * const      mandocerrs[MANDOCERR_MAX] = {
        "no document body",
        "content before first section header",
        "first section is not \"NAME\"",
        "no document body",
        "content before first section header",
        "first section is not \"NAME\"",

-       "bad NAME section contents",
+       "NAME section without name",
+       "NAME section without description",
+       "description not at the end of NAME",
+       "bad NAME section content",

        "missing description line, using \"\"",
        "sections out of conventional order",
        "duplicate section title",
        "missing description line, using \"\"",
        "sections out of conventional order",
        "duplicate section title",


@@ -127,7 +129,6 @@ static      const char * const      mandocerrs[MANDOCERR_MAX] = {
        "blocks badly nested",
        "nested displays are not portable",
        "moving content out of list",
        "blocks badly nested",
        "nested displays are not portable",
        "moving content out of list",

-       ".Vt block has child macro",

        "fill mode already enabled, skipping",
        "fill mode already disabled, skipping",
        "line scope broken",
        "fill mode already enabled, skipping",
        "fill mode already disabled, skipping",
        "line scope broken",


@@ -136,18 +137,22 @@ static    const char * const      mandocerrs[MANDOCERR_MAX] = {
        "skipping empty request",
        "conditional request controls empty scope",
        "skipping empty macro",
        "skipping empty request",
        "conditional request controls empty scope",
        "skipping empty macro",

+       "empty block",

        "empty argument, using 0n",
        "empty argument, using 0n",

-       "argument count wrong",

        "missing display type, using -ragged",
        "list type is not the first argument",
        "missing -width in -tag list, using 8n",
        "missing utility name, using \"\"",
        "missing display type, using -ragged",
        "list type is not the first argument",
        "missing -width in -tag list, using 8n",
        "missing utility name, using \"\"",

+       "missing function name, using \"\"",

        "empty head in list item",
        "empty list item",
        "missing font type, using \\fR",
        "unknown font type, using \\fR",
        "nothing follows prefix",
        "empty head in list item",
        "empty list item",
        "missing font type, using \\fR",
        "unknown font type, using \\fR",
        "nothing follows prefix",

+       "empty reference block",

        "missing -std argument, adding it",
        "missing -std argument, adding it",

+       "missing option string, using \"\"",
+       "missing resource identifier, using \"\"",

        "missing eqn box, using \"\"",
 
        /* related to bad macro arguments */
        "missing eqn box, using \"\"",
 
        /* related to bad macro arguments */


@@ -157,12 +162,14 @@ static    const char * const      mandocerrs[MANDOCERR_MAX] = {
        "skipping duplicate display type",
        "skipping duplicate list type",
        "skipping -width argument",
        "skipping duplicate display type",
        "skipping duplicate list type",
        "skipping -width argument",

+       "wrong number of cells",

        "unknown AT&T UNIX version",
        "comma in function argument",
        "parenthesis in function name",
        "invalid content in Rs block",
        "invalid Boolean argument",
        "unknown font, skipping request",
        "unknown AT&T UNIX version",
        "comma in function argument",
        "parenthesis in function name",
        "invalid content in Rs block",
        "invalid Boolean argument",
        "unknown font, skipping request",

+       "odd number of characters in request",

 
        /* related to plain text */
        "blank line in fill mode, using .sp",
 
        /* related to plain text */
        "blank line in fill mode, using .sp",


@@ -207,7 +214,6 @@ static      const char * const      mandocerrs[MANDOCERR_MAX] = {
 
        /* related to request and macro arguments */
        "escaped character not allowed in a name",
 
        /* related to request and macro arguments */
        "escaped character not allowed in a name",

-       "argument count wrong",

        "NOT IMPLEMENTED: Bd -file",
        "missing list type, using -item",
        "missing manual name, using \"\"",
        "NOT IMPLEMENTED: Bd -file",
        "missing list type, using -item",
        "missing manual name, using \"\"",


@@ -282,24 +288,22 @@ choose_parser(struct mparse *curp)
                }
        }
 
                }
        }
 

-       if (format == MPARSE_MDOC) {
-               if (NULL == curp->pmdoc)
-                       curp->pmdoc = mdoc_alloc(
-                           curp->roff, curp, curp->defos,
-                           MPARSE_QUICK & curp->options ? 1 : 0);
-               assert(curp->pmdoc);
-               curp->mdoc = curp->pmdoc;
-               return;
+       if (curp->man == NULL) {
+               curp->man = roff_man_alloc(curp->roff, curp, curp->defos,
+                   curp->options & MPARSE_QUICK ? 1 : 0);
+               curp->man->macroset = MACROSET_MAN;
+               curp->man->first->tok = TOKEN_NONE;

        }
 
        }
 

-       /* Fall back to man(7) as a last resort. */
-
-       if (NULL == curp->pman)
-               curp->pman = man_alloc(
-                   curp->roff, curp, curp->defos,
-                   MPARSE_QUICK & curp->options ? 1 : 0);
-       assert(curp->pman);
-       curp->man = curp->pman;
+       if (format == MPARSE_MDOC) {
+               mdoc_hash_init();
+               curp->man->macroset = MACROSET_MDOC;
+               curp->man->first->tok = TOKEN_NONE;
+       } else {
+               man_hash_init();
+               curp->man->macroset = MACROSET_MAN;
+               curp->man->first->tok = TOKEN_NONE;
+       }

 }
 
 /*
 }
 
 /*


@@ -321,7 +325,6 @@ mparse_buf_r(struct mparse *curp, struct buf blk, size_t i, int start)
        int              of;
        int              lnn; /* line number in the real file */
        int              fd;
        int              of;
        int              lnn; /* line number in the real file */
        int              fd;

-       pid_t            save_child;

        unsigned char    c;
 
        memset(&ln, 0, sizeof(ln));
        unsigned char    c;
 
        memset(&ln, 0, sizeof(ln));


@@ -394,7 +397,8 @@ mparse_buf_r(struct mparse *curp, struct buf blk, size_t i, int start)
                                    MANDOCERR_CHAR_UNSUPP,
                                    curp, curp->line, pos, "0x%x", c);
                                i++;
                                    MANDOCERR_CHAR_UNSUPP,
                                    curp, curp->line, pos, "0x%x", c);
                                i++;

-                               ln.buf[pos++] = '?';
+                               if (c != '\r')
+                                       ln.buf[pos++] = '?';

                                continue;
                        }
 
                                continue;
                        }
 


@@ -532,7 +536,6 @@ rerun:
                        if (curp->secondary)
                                curp->secondary->sz -= pos + 1;
                        save_file = curp->file;
                        if (curp->secondary)
                                curp->secondary->sz -= pos + 1;
                        save_file = curp->file;

-                       save_child = curp->child;

                        if (mparse_open(curp, &fd, ln.buf + of) ==
                            MANDOCLEVEL_OK) {
                                mparse_readfd(curp, fd, ln.buf + of);
                        if (mparse_open(curp, &fd, ln.buf + of) ==
                            MANDOCLEVEL_OK) {
                                mparse_readfd(curp, fd, ln.buf + of);


@@ -550,7 +553,6 @@ rerun:
                                of = 0;
                                mparse_buf_r(curp, ln, of, 0);
                        }
                                of = 0;
                                mparse_buf_r(curp, ln, of, 0);
                        }

-                       curp->child = save_child;

                        pos = 0;
                        continue;
                default:
                        pos = 0;
                        continue;
                default:


@@ -564,7 +566,8 @@ rerun:
                 * parsers with each one.
                 */
 
                 * parsers with each one.
                 */
 

-               if ( ! (curp->man || curp->mdoc))
+               if (curp->man == NULL ||
+                   curp->man->macroset == MACROSET_NONE)

                        choose_parser(curp);
 
                /*
                        choose_parser(curp);
 
                /*


@@ -576,19 +579,13 @@ rerun:
                 * Do the same for ROFF_EQN.
                 */
 
                 * Do the same for ROFF_EQN.
                 */
 

-               if (rr == ROFF_TBL) {
+               if (rr == ROFF_TBL)

                        while ((span = roff_span(curp->roff)) != NULL)
                        while ((span = roff_span(curp->roff)) != NULL)

-                               if (curp->man == NULL)
-                                       mdoc_addspan(curp->mdoc, span);
-                               else
-                                       man_addspan(curp->man, span);
-               } else if (rr == ROFF_EQN) {
-                       if (curp->man == NULL)
-                               mdoc_addeqn(curp->mdoc, roff_eqn(curp->roff));
-                       else
-                               man_addeqn(curp->man, roff_eqn(curp->roff));
-               } else if ((curp->man == NULL ?
-                   mdoc_parseln(curp->mdoc, curp->line, ln.buf, of) :
+                               roff_addtbl(curp->man, span);
+               else if (rr == ROFF_EQN)
+                       roff_addeqn(curp->man, roff_eqn(curp->roff));
+               else if ((curp->man->macroset == MACROSET_MDOC ?
+                   mdoc_parseln(curp->man, curp->line, ln.buf, of) :

                    man_parseln(curp->man, curp->line, ln.buf, of)) == 2)
                                break;
 
                    man_parseln(curp->man, curp->line, ln.buf, of)) == 2)
                                break;
 


@@ -609,15 +606,15 @@ static int
 read_whole_file(struct mparse *curp, const char *file, int fd,
                struct buf *fb, int *with_mmap)
 {
 read_whole_file(struct mparse *curp, const char *file, int fd,
                struct buf *fb, int *with_mmap)
 {

+       gzFile           gz;

        size_t           off;
        ssize_t          ssz;
 
 #if HAVE_MMAP
        struct stat      st;
        size_t           off;
        ssize_t          ssz;
 
 #if HAVE_MMAP
        struct stat      st;

-       if (-1 == fstat(fd, &st)) {
-               perror(file);
-               exit((int)MANDOCLEVEL_SYSERR);
-       }
+
+       if (fstat(fd, &st) == -1)
+               err((int)MANDOCLEVEL_SYSERR, "%s", file);

 
        /*
         * If we're a regular file, try just reading in the whole entry
 
        /*
         * If we're a regular file, try just reading in the whole entry


@@ -626,19 +623,25 @@ read_whole_file(struct mparse *curp, const char *file, int fd,
         * concerned that this is going to tank any machines.
         */
 
         * concerned that this is going to tank any machines.
         */
 

-       if (S_ISREG(st.st_mode)) {
-               if (st.st_size >= (1U << 31)) {
+       if (curp->gzip == 0 && S_ISREG(st.st_mode)) {
+               if (st.st_size > 0x7fffffff) {

                        mandoc_msg(MANDOCERR_TOOLARGE, curp, 0, 0, NULL);
                        mandoc_msg(MANDOCERR_TOOLARGE, curp, 0, 0, NULL);

-                       return(0);
+                       return 0;

                }
                *with_mmap = 1;
                fb->sz = (size_t)st.st_size;
                fb->buf = mmap(NULL, fb->sz, PROT_READ, MAP_SHARED, fd, 0);
                if (fb->buf != MAP_FAILED)
                }
                *with_mmap = 1;
                fb->sz = (size_t)st.st_size;
                fb->buf = mmap(NULL, fb->sz, PROT_READ, MAP_SHARED, fd, 0);
                if (fb->buf != MAP_FAILED)

-                       return(1);
+                       return 1;

        }
 #endif
 
        }
 #endif
 

+       if (curp->gzip) {
+               if ((gz = gzdopen(fd, "rb")) == NULL)
+                       err((int)MANDOCLEVEL_SYSERR, "%s", file);
+       } else
+               gz = NULL;
+

        /*
         * If this isn't a regular file (like, say, stdin), then we must
         * go the old way and just read things in bit by bit.
        /*
         * If this isn't a regular file (like, say, stdin), then we must
         * go the old way and just read things in bit by bit.


@@ -657,43 +660,35 @@ read_whole_file(struct mparse *curp, const char *file, int fd,
                        }
                        resize_buf(fb, 65536);
                }
                        }
                        resize_buf(fb, 65536);
                }

-               ssz = read(fd, fb->buf + (int)off, fb->sz - off);
+               ssz = curp->gzip ?
+                   gzread(gz, fb->buf + (int)off, fb->sz - off) :
+                   read(fd, fb->buf + (int)off, fb->sz - off);

                if (ssz == 0) {
                        fb->sz = off;
                if (ssz == 0) {
                        fb->sz = off;

-                       return(1);
-               }
-               if (ssz == -1) {
-                       perror(file);
-                       exit((int)MANDOCLEVEL_SYSERR);
+                       return 1;

                }
                }

+               if (ssz == -1)
+                       err((int)MANDOCLEVEL_SYSERR, "%s", file);

                off += (size_t)ssz;
        }
 
        free(fb->buf);
        fb->buf = NULL;
                off += (size_t)ssz;
        }
 
        free(fb->buf);
        fb->buf = NULL;

-       return(0);
+       return 0;

 }
 
 static void
 mparse_end(struct mparse *curp)
 {
 
 }
 
 static void
 mparse_end(struct mparse *curp)
 {
 

-       if (curp->mdoc == NULL &&
-           curp->man == NULL &&
-           curp->sodest == NULL) {
-               if (curp->options & MPARSE_MDOC)
-                       curp->mdoc = curp->pmdoc;
-               else {
-                       if (curp->pman == NULL)
-                               curp->pman = man_alloc(
-                                   curp->roff, curp, curp->defos,
-                                   curp->options & MPARSE_QUICK ? 1 : 0);
-                       curp->man = curp->pman;
-               }
-       }
-       if (curp->mdoc)
-               mdoc_endparse(curp->mdoc);
-       if (curp->man)
+       if (curp->man == NULL && curp->sodest == NULL)
+               curp->man = roff_man_alloc(curp->roff, curp, curp->defos,
+                   curp->options & MPARSE_QUICK ? 1 : 0);
+       if (curp->man->macroset == MACROSET_NONE)
+               curp->man->macroset = MACROSET_MAN;
+       if (curp->man->macroset == MACROSET_MDOC)
+               mdoc_endparse(curp->man);
+       else

                man_endparse(curp->man);
        roff_endparse(curp->roff);
 }
                man_endparse(curp->man);
        roff_endparse(curp->roff);
 }


@@ -748,7 +743,7 @@ mparse_readmem(struct mparse *curp, void *buf, size_t len,
        blk.sz = len;
 
        mparse_parse_buffer(curp, blk, file);
        blk.sz = len;
 
        mparse_parse_buffer(curp, blk, file);

-       return(curp->file_status);
+       return curp->file_status;

 }
 
 /*
 }
 
 /*


@@ -779,102 +774,47 @@ mparse_readfd(struct mparse *curp, int fd, const char *file)
        if (fd != STDIN_FILENO && close(fd) == -1)
                perror(file);
 
        if (fd != STDIN_FILENO && close(fd) == -1)
                perror(file);
 

-       mparse_wait(curp);
-       return(curp->file_status);
+       return curp->file_status;

 }
 
 enum mandoclevel
 mparse_open(struct mparse *curp, int *fd, const char *file)
 {
 }
 
 enum mandoclevel
 mparse_open(struct mparse *curp, int *fd, const char *file)
 {

-       int               pfd[2];
-       int               save_errno;

        char             *cp;
 
        curp->file = file;
        char             *cp;
 
        curp->file = file;

+       cp = strrchr(file, '.');
+       curp->gzip = (cp != NULL && ! strcmp(cp + 1, "gz"));

 
 

-       /* Unless zipped, try to just open the file. */
+       /* First try to use the filename as it is. */

 
 

-       if ((cp = strrchr(file, '.')) == NULL ||
-           strcmp(cp + 1, "gz")) {
-               curp->child = 0;
-               if ((*fd = open(file, O_RDONLY)) != -1)
-                       return(MANDOCLEVEL_OK);
+       if ((*fd = open(file, O_RDONLY)) != -1)
+               return MANDOCLEVEL_OK;

 
 

-               /* Open failed; try to append ".gz". */
+       /*
+        * If that doesn't work and the filename doesn't
+        * already  end in .gz, try appending .gz.
+        */

 
 

+       if ( ! curp->gzip) {

                mandoc_asprintf(&cp, "%s.gz", file);
                mandoc_asprintf(&cp, "%s.gz", file);

-               file = cp;
-       } else
-               cp = NULL;
-
-       /* Before forking, make sure the file can be read. */
-
-       save_errno = errno;
-       if (access(file, R_OK) == -1) {
-               if (cp != NULL)
-                       errno = save_errno;
+               *fd = open(file, O_RDONLY);

                free(cp);
                free(cp);

-               *fd = -1;
-               curp->child = 0;
-               mandoc_msg(MANDOCERR_FILE, curp, 0, 0, strerror(errno));
-               return(MANDOCLEVEL_ERROR);
-       }
-
-       /* Run gunzip(1). */
-
-       if (pipe(pfd) == -1) {
-               perror("pipe");
-               exit((int)MANDOCLEVEL_SYSERR);
-       }
-
-       switch (curp->child = fork()) {
-       case -1:
-               perror("fork");
-               exit((int)MANDOCLEVEL_SYSERR);
-       case 0:
-               close(pfd[0]);
-               if (dup2(pfd[1], STDOUT_FILENO) == -1) {
-                       perror("dup");
-                       exit((int)MANDOCLEVEL_SYSERR);
+               if (*fd != -1) {
+                       curp->gzip = 1;
+                       return MANDOCLEVEL_OK;

                }
                }

-               execlp("gunzip", "gunzip", "-c", file, NULL);
-               perror("exec");
-               exit((int)MANDOCLEVEL_SYSERR);
-       default:
-               close(pfd[1]);
-               *fd = pfd[0];
-               return(MANDOCLEVEL_OK);

        }
        }

-}

 
 

-enum mandoclevel
-mparse_wait(struct mparse *curp)
-{
-       int       status;
-
-       if (curp->child == 0)
-               return(MANDOCLEVEL_OK);
+       /* Neither worked, give up. */

 
 

-       if (waitpid(curp->child, &status, 0) == -1) {
-               perror("wait");
-               exit((int)MANDOCLEVEL_SYSERR);
-       }
-       if (WIFSIGNALED(status)) {
-               mandoc_vmsg(MANDOCERR_FILE, curp, 0, 0,
-                   "gunzip died from signal %d", WTERMSIG(status));
-               return(MANDOCLEVEL_ERROR);
-       }
-       if (WEXITSTATUS(status)) {
-               mandoc_vmsg(MANDOCERR_FILE, curp, 0, 0,
-                   "gunzip failed with code %d", WEXITSTATUS(status));
-               return(MANDOCLEVEL_ERROR);
-       }
-       return(MANDOCLEVEL_OK);
+       mandoc_msg(MANDOCERR_FILE, curp, 0, 0, strerror(errno));
+       return MANDOCLEVEL_ERROR;

 }
 
 struct mparse *
 mparse_alloc(int options, enum mandoclevel wlevel, mandocmsg mmsg,
 }
 
 struct mparse *
 mparse_alloc(int options, enum mandoclevel wlevel, mandocmsg mmsg,

-    const struct mchars *mchars, const char *defos)
+    const char *defos)

 {
        struct mparse   *curp;
 
 {
        struct mparse   *curp;
 


@@ -885,18 +825,18 @@ mparse_alloc(int options, enum mandoclevel wlevel, mandocmsg mmsg,
        curp->mmsg = mmsg;
        curp->defos = defos;
 
        curp->mmsg = mmsg;
        curp->defos = defos;
 

-       curp->mchars = mchars;
-       curp->roff = roff_alloc(curp, curp->mchars, options);
-       if (curp->options & MPARSE_MDOC)
-               curp->pmdoc = mdoc_alloc(
-                   curp->roff, curp, curp->defos,
-                   curp->options & MPARSE_QUICK ? 1 : 0);
-       if (curp->options & MPARSE_MAN)
-               curp->pman = man_alloc(
-                   curp->roff, curp, curp->defos,
-                   curp->options & MPARSE_QUICK ? 1 : 0);
-
-       return(curp);
+       curp->roff = roff_alloc(curp, options);
+       curp->man = roff_man_alloc( curp->roff, curp, curp->defos,
+               curp->options & MPARSE_QUICK ? 1 : 0);
+       if (curp->options & MPARSE_MDOC) {
+               mdoc_hash_init();
+               curp->man->macroset = MACROSET_MDOC;
+       } else if (curp->options & MPARSE_MAN) {
+               man_hash_init();
+               curp->man->macroset = MACROSET_MAN;
+       }
+       curp->man->first->tok = TOKEN_NONE;
+       return curp;

 }
 
 void
 }
 
 void


@@ -905,16 +845,12 @@ mparse_reset(struct mparse *curp)
 
        roff_reset(curp->roff);
 
 
        roff_reset(curp->roff);
 

-       if (curp->mdoc)
-               mdoc_reset(curp->mdoc);
-       if (curp->man)
-               man_reset(curp->man);
+       if (curp->man != NULL)
+               roff_man_reset(curp->man);

        if (curp->secondary)
                curp->secondary->sz = 0;
 
        curp->file_status = MANDOCLEVEL_OK;
        if (curp->secondary)
                curp->secondary->sz = 0;
 
        curp->file_status = MANDOCLEVEL_OK;

-       curp->mdoc = NULL;
-       curp->man = NULL;

 
        free(curp->sodest);
        curp->sodest = NULL;
 
        free(curp->sodest);
        curp->sodest = NULL;


@@ -924,10 +860,7 @@ void
 mparse_free(struct mparse *curp)
 {
 
 mparse_free(struct mparse *curp)
 {
 

-       if (curp->pmdoc)
-               mdoc_free(curp->pmdoc);
-       if (curp->pman)
-               man_free(curp->pman);
+       roff_man_free(curp->man);

        if (curp->roff)
                roff_free(curp->roff);
        if (curp->secondary)
        if (curp->roff)
                roff_free(curp->roff);
        if (curp->secondary)


@@ -939,17 +872,14 @@ mparse_free(struct mparse *curp)
 }
 
 void
 }
 
 void

-mparse_result(struct mparse *curp,
-       struct mdoc **mdoc, struct man **man, char **sodest)
+mparse_result(struct mparse *curp, struct roff_man **man,
+       char **sodest)

 {
 
        if (sodest && NULL != (*sodest = curp->sodest)) {
 {
 
        if (sodest && NULL != (*sodest = curp->sodest)) {

-               *mdoc = NULL;

                *man = NULL;
                return;
        }
                *man = NULL;
                return;
        }

-       if (mdoc)
-               *mdoc = curp->mdoc;

        if (man)
                *man = curp->man;
 }
        if (man)
                *man = curp->man;
 }


@@ -992,13 +922,13 @@ const char *
 mparse_strerror(enum mandocerr er)
 {
 
 mparse_strerror(enum mandocerr er)
 {
 

-       return(mandocerrs[er]);
+       return mandocerrs[er];

 }
 
 const char *
 mparse_strlevel(enum mandoclevel lvl)
 {
 }
 
 const char *
 mparse_strlevel(enum mandoclevel lvl)
 {

-       return(mandoclevels[lvl]);
+       return mandoclevels[lvl];

 }
 
 void
 }
 
 void


@@ -1014,5 +944,5 @@ mparse_getkeep(const struct mparse *p)
 {
 
        assert(p->secondary);
 {
 
        assert(p->secondary);

-       return(p->secondary->sz ? p->secondary->buf : NULL);
+       return p->secondary->sz ? p->secondary->buf : NULL;

 }
 }