No longer use names that only occur in the SYNOPSIS section as names

[mandoc.git] / read.c

diff --git a/read.c b/read.c
index 6ca9232a59de356cf83a3221a19ed3210c0e292d..1af1b2836383d0ec15cf6dfea58a3e8fc8023aaa 100644 (file)
--- a/read.c
+++ b/read.c
@@ -1,7 +1,7 @@
-/*     $Id: read.c,v 1.137 2015/04/18 17:28:36 schwarze Exp $ */
+/*     $Id: read.c,v 1.192 2017/07/20 14:36:36 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-2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org>

  * Copyright (c) 2010, 2012 Joerg Sonnenberger <joerg@netbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * Copyright (c) 2010, 2012 Joerg Sonnenberger <joerg@netbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any


@@ -19,23 +19,19 @@
 #include "config.h"
 
 #include <sys/types.h>
 #include "config.h"
 
 #include <sys/types.h>

-#if HAVE_MMAP

 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <sys/stat.h>

-#endif
-#include <sys/wait.h>

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

-#include <signal.h>

 #include <stdarg.h>
 #include <stdarg.h>

-#include <stdint.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

+#include <zlib.h>

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


@@ -47,27 +43,26 @@
 #define        REPARSE_LIMIT   1000
 
 struct mparse {
 #define        REPARSE_LIMIT   1000
 
 struct mparse {

-       struct roff_man  *man; /* man parser */

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

-       const struct mchars *mchars; /* character table */
+       struct roff_man  *man; /* man parser */

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

-       const char       *defos; /* default operating system */
+       const char       *os_s; /* default operating system */

        mandocmsg         mmsg; /* warning/error message handler */
        enum mandoclevel  file_status; /* status of current parse */
        mandocmsg         mmsg; /* warning/error message handler */
        enum mandoclevel  file_status; /* status of current parse */

-       enum mandoclevel  wlevel; /* ignore messages below this */
+       enum mandocerr    mmin; /* ignore messages below this */

        int               options; /* parser options */
        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      resize_buf(struct buf *, size_t);
 };
 
 static void      choose_parser(struct mparse *);
 static void      resize_buf(struct buf *, size_t);

-static void      mparse_buf_r(struct mparse *, struct buf, size_t, int);
+static int       mparse_buf_r(struct mparse *, struct buf, size_t, int);

 static int       read_whole_file(struct mparse *, const char *, int,
                                struct buf *, int *);
 static void      mparse_end(struct mparse *);
 static int       read_whole_file(struct mparse *, const char *, int,
                                struct buf *, int *);
 static void      mparse_end(struct mparse *);


@@ -76,7 +71,7 @@ static        void      mparse_parse_buffer(struct mparse *, struct buf,
 
 static const enum mandocerr    mandoclimits[MANDOCLEVEL_MAX] = {
        MANDOCERR_OK,
 
 static const enum mandocerr    mandoclimits[MANDOCLEVEL_MAX] = {
        MANDOCERR_OK,

-       MANDOCERR_WARNING,
+       MANDOCERR_OK,

        MANDOCERR_WARNING,
        MANDOCERR_ERROR,
        MANDOCERR_UNSUPP,
        MANDOCERR_WARNING,
        MANDOCERR_ERROR,
        MANDOCERR_UNSUPP,


@@ -87,20 +82,46 @@ static      const enum mandocerr    mandoclimits[MANDOCLEVEL_MAX] = {
 static const char * const      mandocerrs[MANDOCERR_MAX] = {
        "ok",
 
 static const char * const      mandocerrs[MANDOCERR_MAX] = {
        "ok",
 

+       "base system convention",
+
+       "Mdocdate found",
+       "Mdocdate missing",
+       "unknown architecture",
+       "operating system explicitly specified",
+       "RCS id missing",
+       "referenced manual not found",
+
+       "generic style suggestion",
+
+       "legacy man(7) date format",
+       "lower case character in document title",
+       "duplicate RCS id",
+       "typo in section name",
+       "unterminated quoted argument",
+       "useless macro",
+       "consider using OS macro",
+       "errnos out of order",
+       "duplicate errno",
+       "trailing delimiter",
+       "no blank before trailing delimiter",
+       "fill mode already enabled, skipping",
+       "fill mode already disabled, skipping",
+       "function name without markup",
+       "whitespace at end of input line",
+       "bad comment style",
+

        "generic warning",
 
        /* related to the prologue */
        "missing manual title, using UNTITLED",
        "missing manual title, using \"\"",
        "generic warning",
 
        /* related to the prologue */
        "missing manual title, using UNTITLED",
        "missing manual title, using \"\"",

-       "lower case character in document title",

        "missing manual section, using \"\"",
        "unknown manual section",
        "missing date, using today's date",
        "cannot parse date, using it verbatim",
        "missing manual section, using \"\"",
        "unknown manual section",
        "missing date, using today's date",
        "cannot parse date, using it verbatim",

+       "date in the future, using it anyway",

        "missing Os macro, using \"\"",
        "missing Os macro, using \"\"",

-       "duplicate prologue macro",

        "late prologue macro",
        "late prologue macro",

-       "skipping late title macro",

        "prologue macros out of order",
 
        /* related to document structure */
        "prologue macros out of order",
 
        /* related to document structure */


@@ -108,14 +129,17 @@ 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\"",

-       "NAME section without name",
+       "NAME section without Nm before Nd",

        "NAME section without description",
        "description not at the end of NAME",
        "bad NAME section content",
        "NAME section without description",
        "description not at the end of NAME",
        "bad NAME section content",

+       "missing comma before name",

        "missing description line, using \"\"",
        "missing description line, using \"\"",

+       "description line outside NAME section",

        "sections out of conventional order",
        "duplicate section title",
        "unexpected section",
        "sections out of conventional order",
        "duplicate section title",
        "unexpected section",

+       "cross reference to self",

        "unusual Xr order",
        "unusual Xr punctuation",
        "AUTHORS section without An macro",
        "unusual Xr order",
        "unusual Xr punctuation",
        "AUTHORS section without An macro",


@@ -129,10 +153,9 @@ 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",
+       "first macro on line",

        "line scope broken",
        "line scope broken",

+       "skipping blank line in line scope",

 
        /* related to missing macro arguments */
        "skipping empty request",
 
        /* related to missing macro arguments */
        "skipping empty request",


@@ -142,22 +165,23 @@ static    const char * const      mandocerrs[MANDOCERR_MAX] = {
        "empty argument, using 0n",
        "missing display type, using -ragged",
        "list type is not the first argument",
        "empty argument, using 0n",
        "missing display type, using -ragged",
        "list type is not the first argument",

-       "missing -width in -tag list, using 8n",
+       "missing -width in -tag list, using 6n",

        "missing utility name, using \"\"",
        "missing function name, using \"\"",
        "empty head in list item",
        "empty list item",
        "missing utility name, using \"\"",
        "missing function name, using \"\"",
        "empty head in list item",
        "empty list item",

+       "missing argument, using next line",

        "missing font type, using \\fR",
        "unknown font type, using \\fR",
        "nothing follows prefix",
        "empty reference block",
        "missing font type, using \\fR",
        "unknown font type, using \\fR",
        "nothing follows prefix",
        "empty reference block",

+       "missing section argument",

        "missing -std argument, adding it",
        "missing option string, using \"\"",
        "missing resource identifier, using \"\"",
        "missing eqn box, using \"\"",
 
        /* related to bad macro arguments */
        "missing -std argument, adding it",
        "missing option string, using \"\"",
        "missing resource identifier, using \"\"",
        "missing eqn box, using \"\"",
 
        /* related to bad macro arguments */

-       "unterminated quoted argument",

        "duplicate argument",
        "skipping duplicate argument",
        "skipping duplicate display type",
        "duplicate argument",
        "skipping duplicate argument",
        "skipping duplicate display type",


@@ -167,6 +191,7 @@ static      const char * const      mandocerrs[MANDOCERR_MAX] = {
        "unknown AT&T UNIX version",
        "comma in function argument",
        "parenthesis in function name",
        "unknown AT&T UNIX version",
        "comma in function argument",
        "parenthesis in function name",

+       "unknown library name",

        "invalid content in Rs block",
        "invalid Boolean argument",
        "unknown font, skipping request",
        "invalid content in Rs block",
        "invalid Boolean argument",
        "unknown font, skipping request",


@@ -175,8 +200,7 @@ static      const char * const      mandocerrs[MANDOCERR_MAX] = {
        /* related to plain text */
        "blank line in fill mode, using .sp",
        "tab in filled text",
        /* related to plain text */
        "blank line in fill mode, using .sp",
        "tab in filled text",

-       "whitespace at end of input line",
-       "bad comment style",
+       "new sentence, new line",

        "invalid escape sequence",
        "undefined string, using \"\"",
 
        "invalid escape sequence",
        "undefined string, using \"\"",
 


@@ -202,6 +226,8 @@ static      const char * const      mandocerrs[MANDOCERR_MAX] = {
 
        /* related to document structure and macros */
        NULL,
 
        /* related to document structure and macros */
        NULL,

+       "duplicate prologue macro",
+       "skipping late title macro",

        "input stack limit exceeded, infinite loop?",
        "skipping bad character",
        "skipping unknown macro",
        "input stack limit exceeded, infinite loop?",
        "skipping bad character",
        "skipping unknown macro",


@@ -216,7 +242,9 @@ static      const char * const      mandocerrs[MANDOCERR_MAX] = {
        /* related to request and macro arguments */
        "escaped character not allowed in a name",
        "NOT IMPLEMENTED: Bd -file",
        /* related to request and macro arguments */
        "escaped character not allowed in a name",
        "NOT IMPLEMENTED: Bd -file",

+       "skipping display without arguments",

        "missing list type, using -item",
        "missing list type, using -item",

+       "argument is not numeric, using 1",

        "missing manual name, using \"\"",
        "uname(3) system call failed, using UNKNOWN",
        "unknown standard specifier",
        "missing manual name, using \"\"",
        "uname(3) system call failed, using UNKNOWN",
        "unknown standard specifier",


@@ -238,7 +266,7 @@ static      const char * const      mandocerrs[MANDOCERR_MAX] = {
 
 static const char * const      mandoclevels[MANDOCLEVEL_MAX] = {
        "SUCCESS",
 
 static const char * const      mandoclevels[MANDOCLEVEL_MAX] = {
        "SUCCESS",

-       "RESERVED",
+       "STYLE",

        "WARNING",
        "ERROR",
        "UNSUPP",
        "WARNING",
        "ERROR",
        "UNSUPP",


@@ -289,22 +317,16 @@ choose_parser(struct mparse *curp)
                }
        }
 
                }
        }
 

-       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 = MDOC_MAX;
-       }
-

        if (format == MPARSE_MDOC) {
        if (format == MPARSE_MDOC) {

-               mdoc_hash_init();

                curp->man->macroset = MACROSET_MDOC;
                curp->man->macroset = MACROSET_MDOC;

-               curp->man->first->tok = MDOC_MAX;
+               if (curp->man->mdocmac == NULL)
+                       curp->man->mdocmac = roffhash_alloc(MDOC_Dd, MDOC_MAX);

        } else {
        } else {

-               man_hash_init();

                curp->man->macroset = MACROSET_MAN;
                curp->man->macroset = MACROSET_MAN;

-               curp->man->first->tok = MAN_MAX;
+               if (curp->man->manmac == NULL)
+                       curp->man->manmac = roffhash_alloc(MAN_TH, MAN_MAX);

        }
        }

+       curp->man->first->tok = TOKEN_NONE;

 }
 
 /*
 }
 
 /*


@@ -314,10 +336,9 @@ choose_parser(struct mparse *curp)
  * macros, inline equations, and input line traps)
  * and indirectly (for .so file inclusion).
  */
  * macros, inline equations, and input line traps)
  * and indirectly (for .so file inclusion).
  */

-static void
+static int

 mparse_buf_r(struct mparse *curp, struct buf blk, size_t i, int start)
 {
 mparse_buf_r(struct mparse *curp, struct buf blk, size_t i, int start)
 {

-       const struct tbl_span   *span;

        struct buf       ln;
        const char      *save_file;
        char            *cp;
        struct buf       ln;
        const char      *save_file;
        char            *cp;


@@ -326,7 +347,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));


@@ -404,72 +424,14 @@ mparse_buf_r(struct mparse *curp, struct buf blk, size_t i, int start)
                                continue;
                        }
 
                                continue;
                        }
 

-                       /* Trailing backslash = a plain char. */
-
-                       if (blk.buf[i] != '\\' || i + 1 == blk.sz) {
-                               ln.buf[pos++] = blk.buf[i++];
-                               continue;
-                       }
-
-                       /*
-                        * Found escape and at least one other character.
-                        * When it's a newline character, skip it.
-                        * When there is a carriage return in between,
-                        * skip that one as well.
-                        */
-
-                       if ('\r' == blk.buf[i + 1] && i + 2 < blk.sz &&
-                           '\n' == blk.buf[i + 2])
-                               ++i;
-                       if ('\n' == blk.buf[i + 1]) {
-                               i += 2;
-                               ++lnn;
-                               continue;
-                       }
-
-                       if ('"' == blk.buf[i + 1] || '#' == blk.buf[i + 1]) {
-                               i += 2;
-                               /* Comment, skip to end of line */
-                               for (; i < blk.sz; ++i) {
-                                       if ('\n' == blk.buf[i]) {
-                                               ++i;
-                                               ++lnn;
-                                               break;
-                                       }
-                               }
-
-                               /* Backout trailing whitespaces */
-                               for (; pos > 0; --pos) {
-                                       if (ln.buf[pos - 1] != ' ')
-                                               break;
-                                       if (pos > 2 && ln.buf[pos - 2] == '\\')
-                                               break;
-                               }
-                               break;
-                       }
-
-                       /* Catch escaped bogus characters. */
-
-                       c = (unsigned char) blk.buf[i+1];
-
-                       if ( ! (isascii(c) &&
-                           (isgraph(c) || isblank(c)))) {
-                               mandoc_vmsg(MANDOCERR_CHAR_BAD, curp,
-                                   curp->line, pos, "0x%x", c);
-                               i += 2;
-                               ln.buf[pos++] = '?';
-                               continue;
-                       }
-
-                       /* Some other escape sequence, copy & cont. */
-
-                       ln.buf[pos++] = blk.buf[i++];

                        ln.buf[pos++] = blk.buf[i++];
                }
 
                        ln.buf[pos++] = blk.buf[i++];
                }
 

-               if (pos >= ln.sz)
+               if (pos + 1 >= ln.sz)

                        resize_buf(&ln, 256);
 
                        resize_buf(&ln, 256);
 

+               if (i == blk.sz || blk.buf[i] == '\0')
+                       ln.buf[pos++] = '\n';

                ln.buf[pos] = '\0';
 
                /*
                ln.buf[pos] = '\0';
 
                /*


@@ -508,13 +470,16 @@ rerun:
 
                switch (rr) {
                case ROFF_REPARSE:
 
                switch (rr) {
                case ROFF_REPARSE:

-                       if (REPARSE_LIMIT >= ++curp->reparse_count)
-                               mparse_buf_r(curp, ln, of, 0);
-                       else
+                       if (++curp->reparse_count > REPARSE_LIMIT)

                                mandoc_msg(MANDOCERR_ROFFLOOP, curp,
                                    curp->line, pos, NULL);
                                mandoc_msg(MANDOCERR_ROFFLOOP, curp,
                                    curp->line, pos, NULL);

-                       pos = 0;
-                       continue;
+                       else if (mparse_buf_r(curp, ln, of, 0) == 1 ||
+                           start == 1) {
+                               pos = 0;
+                               continue;
+                       }
+                       free(ln.buf);
+                       return 0;

                case ROFF_APPEND:
                        pos = strlen(ln.buf);
                        continue;
                case ROFF_APPEND:
                        pos = strlen(ln.buf);
                        continue;


@@ -528,7 +493,7 @@ rerun:
                            (i >= blk.sz || blk.buf[i] == '\0')) {
                                curp->sodest = mandoc_strdup(ln.buf + of);
                                free(ln.buf);
                            (i >= blk.sz || blk.buf[i] == '\0')) {
                                curp->sodest = mandoc_strdup(ln.buf + of);
                                free(ln.buf);

-                               return;
+                               return 1;

                        }
                        /*
                         * We remove `so' clauses from our lookaside
                        }
                        /*
                         * We remove `so' clauses from our lookaside


@@ -538,10 +503,9 @@ 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) {
+                       if ((fd = mparse_open(curp, ln.buf + of)) != -1) {

                                mparse_readfd(curp, fd, ln.buf + of);
                                mparse_readfd(curp, fd, ln.buf + of);

+                               close(fd);

                                curp->file = save_file;
                        } else {
                                curp->file = save_file;
                                curp->file = save_file;
                        } else {
                                curp->file = save_file;


@@ -556,45 +520,16 @@ 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:
                        break;
                }
 
                        pos = 0;
                        continue;
                default:
                        break;
                }
 

-               /*
-                * If input parsers have not been allocated, do so now.
-                * We keep these instanced between parsers, but set them
-                * locally per parse routine since we can use different
-                * parsers with each one.
-                */
-
-               if (curp->man == NULL ||
-                   curp->man->macroset == MACROSET_NONE)
+               if (curp->man->macroset == MACROSET_NONE)

                        choose_parser(curp);
 
                        choose_parser(curp);
 

-               /*
-                * Lastly, push down into the parsers themselves.
-                * If libroff returns ROFF_TBL, then add it to the
-                * currently open parse.  Since we only get here if
-                * there does exist data (see tbl_data.c), we're
-                * guaranteed that something's been allocated.
-                * Do the same for ROFF_EQN.
-                */
-
-               if (rr == ROFF_TBL) {
-                       while ((span = roff_span(curp->roff)) != NULL)
-                               if (curp->man->macroset == MACROSET_MDOC)
-                                       mdoc_addspan(curp->man, span);
-                               else
-                                       man_addspan(curp->man, span);
-               } else if (rr == ROFF_EQN) {
-                       if (curp->man->macroset == MACROSET_MDOC)
-                               mdoc_addeqn(curp->man, roff_eqn(curp->roff));
-                       else
-                               man_addeqn(curp->man, roff_eqn(curp->roff));
-               } else if ((curp->man->macroset == MACROSET_MDOC ?
+               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;
                    mdoc_parseln(curp->man, curp->line, ln.buf, of) :
                    man_parseln(curp->man, curp->line, ln.buf, of)) == 2)
                                break;


@@ -610,20 +545,22 @@ rerun:
        }
 
        free(ln.buf);
        }
 
        free(ln.buf);

+       return 1;

 }
 
 static int
 read_whole_file(struct mparse *curp, const char *file, int fd,
                struct buf *fb, int *with_mmap)
 {
 }
 
 static int
 read_whole_file(struct mparse *curp, const char *file, int fd,
                struct buf *fb, int *with_mmap)
 {

+       struct stat      st;
+       gzFile           gz;

        size_t           off;
        ssize_t          ssz;
 
        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) {
+               mandoc_vmsg(MANDOCERR_FILE, curp, 0, 0,
+                   "fstat: %s", strerror(errno));
+               return 0;

        }
 
        /*
        }
 
        /*


@@ -633,18 +570,26 @@ 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 (curp->gzip == 0 && S_ISREG(st.st_mode)) {

                if (st.st_size > 0x7fffffff) {
                        mandoc_msg(MANDOCERR_TOOLARGE, curp, 0, 0, NULL);
                if (st.st_size > 0x7fffffff) {
                        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
+
+       if (curp->gzip) {
+               if ((gz = gzdopen(fd, "rb")) == NULL) {
+                       mandoc_vmsg(MANDOCERR_FILE, curp, 0, 0,
+                           "gzdopen: %s", strerror(errno));
+                       return 0;
+               }
+       } else
+               gz = NULL;

 
        /*
         * If this isn't a regular file (like, say, stdin), then we must
 
        /*
         * If this isn't a regular file (like, say, stdin), then we must


@@ -664,30 +609,29 @@ 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);
+                       return 1;

                }
                if (ssz == -1) {
                }
                if (ssz == -1) {

-                       perror(file);
-                       exit((int)MANDOCLEVEL_SYSERR);
+                       mandoc_vmsg(MANDOCERR_FILE, curp, 0, 0,
+                           "read: %s", strerror(errno));
+                       break;

                }
                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->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)
        if (curp->man->macroset == MACROSET_NONE)
                curp->man->macroset = MACROSET_MAN;
        if (curp->man->macroset == MACROSET_MDOC)


@@ -747,7 +691,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;

 }
 
 /*
 }
 
 /*


@@ -767,165 +711,104 @@ mparse_readfd(struct mparse *curp, int fd, const char *file)
                    (MPARSE_UTF8 | MPARSE_LATIN1);
                mparse_parse_buffer(curp, blk, file);
                curp->filenc = save_filenc;
                    (MPARSE_UTF8 | MPARSE_LATIN1);
                mparse_parse_buffer(curp, blk, file);
                curp->filenc = save_filenc;

-#if HAVE_MMAP

                if (with_mmap)
                        munmap(blk.buf, blk.sz);
                else
                if (with_mmap)
                        munmap(blk.buf, blk.sz);
                else

-#endif

                        free(blk.buf);
        }
                        free(blk.buf);
        }

-
-       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)
+int
+mparse_open(struct mparse *curp, const char *file)

 {
 {

-       int               pfd[2];
-       int               save_errno;

        char             *cp;
        char             *cp;

+       int               fd;

 
        curp->file = file;
 
        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 fd;

 
 

-               /* 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(cp, 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 fd;

                }
                }

-               signal(SIGPIPE, SIG_DFL);
-               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);
-       }
-       curp->child = 0;
-       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 -1;

 }
 
 struct mparse *
 }
 
 struct mparse *

-mparse_alloc(int options, enum mandoclevel wlevel, mandocmsg mmsg,
-    const struct mchars *mchars, const char *defos)
+mparse_alloc(int options, enum mandocerr mmin, mandocmsg mmsg,
+    enum mandoc_os os_e, const char *os_s)

 {
        struct mparse   *curp;
 
        curp = mandoc_calloc(1, sizeof(struct mparse));
 
        curp->options = options;
 {
        struct mparse   *curp;
 
        curp = mandoc_calloc(1, sizeof(struct mparse));
 
        curp->options = options;

-       curp->wlevel = wlevel;
+       curp->mmin = mmin;

        curp->mmsg = mmsg;
        curp->mmsg = mmsg;

-       curp->defos = defos;
+       curp->os_s = os_s;

 
 

-       curp->mchars = mchars;
-       curp->roff = roff_alloc(curp, curp->mchars, options);
-       curp->man = roff_man_alloc( curp->roff, curp, curp->defos,
+       curp->roff = roff_alloc(curp, options);
+       curp->man = roff_man_alloc(curp->roff, curp, curp->os_s,

                curp->options & MPARSE_QUICK ? 1 : 0);
        if (curp->options & MPARSE_MDOC) {
                curp->options & MPARSE_QUICK ? 1 : 0);
        if (curp->options & MPARSE_MDOC) {

-               mdoc_hash_init();

                curp->man->macroset = MACROSET_MDOC;
                curp->man->macroset = MACROSET_MDOC;

-               curp->man->first->tok = MDOC_MAX;
+               if (curp->man->mdocmac == NULL)
+                       curp->man->mdocmac = roffhash_alloc(MDOC_Dd, MDOC_MAX);

        } else if (curp->options & MPARSE_MAN) {
        } else if (curp->options & MPARSE_MAN) {

-               man_hash_init();

                curp->man->macroset = MACROSET_MAN;
                curp->man->macroset = MACROSET_MAN;

-               curp->man->first->tok = MAN_MAX;
+               if (curp->man->manmac == NULL)
+                       curp->man->manmac = roffhash_alloc(MAN_TH, MAN_MAX);

        }
        }

-       return(curp);
+       curp->man->first->tok = TOKEN_NONE;
+       curp->man->meta.os_e = os_e;
+       return curp;

 }
 
 void
 mparse_reset(struct mparse *curp)
 {
 }
 
 void
 mparse_reset(struct mparse *curp)
 {

-

        roff_reset(curp->roff);
        roff_reset(curp->roff);

+       roff_man_reset(curp->man);
+
+       free(curp->sodest);
+       curp->sodest = NULL;

 
 

-       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;

-
-       free(curp->sodest);
-       curp->sodest = NULL;
+       curp->gzip = 0;

 }
 
 void
 mparse_free(struct mparse *curp)
 {
 
 }
 
 void
 mparse_free(struct mparse *curp)
 {
 

+       roffhash_free(curp->man->mdocmac);
+       roffhash_free(curp->man->manmac);

        roff_man_free(curp->man);
        roff_man_free(curp->man);

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

        if (curp->secondary)
                free(curp->secondary->buf);
 
        if (curp->secondary)
                free(curp->secondary->buf);
 


@@ -947,6 +830,13 @@ mparse_result(struct mparse *curp, struct roff_man **man,
                *man = curp->man;
 }
 
                *man = curp->man;
 }
 

+void
+mparse_updaterc(struct mparse *curp, enum mandoclevel *rc)
+{
+       if (curp->file_status > *rc)
+               *rc = curp->file_status;
+}
+

 void
 mandoc_vmsg(enum mandocerr t, struct mparse *m,
                int ln, int pos, const char *fmt, ...)
 void
 mandoc_vmsg(enum mandocerr t, struct mparse *m,
                int ln, int pos, const char *fmt, ...)


@@ -967,13 +857,13 @@ mandoc_msg(enum mandocerr er, struct mparse *m,
 {
        enum mandoclevel level;
 
 {
        enum mandoclevel level;
 

+       if (er < m->mmin && er != MANDOCERR_FILE)
+               return;
+

        level = MANDOCLEVEL_UNSUPP;
        while (er < mandoclimits[level])
                level--;
 
        level = MANDOCLEVEL_UNSUPP;
        while (er < mandoclimits[level])
                level--;
 

-       if (level < m->wlevel && er != MANDOCERR_FILE)
-               return;
-

        if (m->mmsg)
                (*m->mmsg)(er, level, m->file, ln, col, msg);
 
        if (m->mmsg)
                (*m->mmsg)(er, level, m->file, ln, col, msg);
 


@@ -985,13 +875,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


@@ -1007,5 +897,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;

 }
 }