The groff man-ext macros define fonts CB, CI, and CR,

[mandoc.git] / read.c

diff --git a/read.c b/read.c
index e7207802adf6de2c2b5fc91055b0f7be56ac9968..0a583445f2cd8a93e04608fcef99f06cd92556d3 100644 (file)
--- a/read.c
+++ b/read.c
@@ -1,7 +1,7 @@
-/*     $Id: read.c,v 1.188 2017/07/04 14:40:38 schwarze Exp $ */
+/*     $Id: read.c,v 1.196 2018/07/28 18:34:15 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-2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2018 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


@@ -24,9 +24,6 @@
 
 #include <assert.h>
 #include <ctype.h>
 
 #include <assert.h>
 #include <ctype.h>

-#if HAVE_ERR
-#include <err.h>
-#endif

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


@@ -42,7 +39,6 @@
 #include "mdoc.h"
 #include "man.h"
 #include "libmandoc.h"
 #include "mdoc.h"
 #include "man.h"
 #include "libmandoc.h"

-#include "roff_int.h"

 
 #define        REPARSE_LIMIT   1000
 
 
 #define        REPARSE_LIMIT   1000
 


@@ -98,31 +94,36 @@ static      const char * const      mandocerrs[MANDOCERR_MAX] = {
        "generic style suggestion",
 
        "legacy man(7) date format",
        "generic style suggestion",
 
        "legacy man(7) date format",

+       "normalizing date format to",
+       "lower case character in document title",

        "duplicate RCS id",
        "duplicate RCS id",

-       "typo in section name",
+       "possible 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",
        "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",
+       "verbatim \"--\", maybe consider using \\(em",

        "function name without markup",
        "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",
        "date in the future, using it anyway",
        "missing Os macro, using \"\"",
        "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 \"\"",

-       "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 */


@@ -155,8 +156,6 @@ static      const char * const      mandocerrs[MANDOCERR_MAX] = {
        "nested displays are not portable",
        "moving content out of list",
        "first macro on line",
        "nested displays are not portable",
        "moving content out of list",
        "first macro on line",

-       "fill mode already enabled, skipping",
-       "fill mode already disabled, skipping",

        "line scope broken",
        "skipping blank line in line scope",
 
        "line scope broken",
        "skipping blank line in line scope",
 


@@ -185,7 +184,6 @@ static      const char * const      mandocerrs[MANDOCERR_MAX] = {
        "missing eqn box, using \"\"",
 
        /* related to bad macro arguments */
        "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",


@@ -204,9 +202,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",

        "new sentence, new line",
        "new sentence, new line",

-       "bad comment style",

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


@@ -232,6 +228,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",


@@ -343,7 +341,6 @@ choose_parser(struct mparse *curp)
 static int
 mparse_buf_r(struct mparse *curp, struct buf blk, size_t i, int start)
 {
 static int
 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;


@@ -534,21 +531,7 @@ rerun:
                if (curp->man->macroset == MACROSET_NONE)
                        choose_parser(curp);
 
                if (curp->man->macroset == MACROSET_NONE)
                        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)
-                               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 ?
+               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;


@@ -575,9 +558,13 @@ read_whole_file(struct mparse *curp, const char *file, int fd,
        gzFile           gz;
        size_t           off;
        ssize_t          ssz;
        gzFile           gz;
        size_t           off;
        ssize_t          ssz;

+       int              gzerrnum, retval;

 
 

-       if (fstat(fd, &st) == -1)
-               err((int)MANDOCLEVEL_SYSERR, "%s", file);
+       if (fstat(fd, &st) == -1) {
+               mandoc_vmsg(MANDOCERR_FILE, curp, 0, 0,
+                   "fstat: %s", strerror(errno));
+               return 0;
+       }

 
        /*
         * 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


@@ -599,8 +586,24 @@ read_whole_file(struct mparse *curp, const char *file, int fd,
        }
 
        if (curp->gzip) {
        }
 
        if (curp->gzip) {

-               if ((gz = gzdopen(fd, "rb")) == NULL)
-                       err((int)MANDOCLEVEL_SYSERR, "%s", file);
+               /*
+                * Duplicating the file descriptor is required
+                * because we will have to call gzclose(3)
+                * to free memory used internally by zlib,
+                * but that will also close the file descriptor,
+                * which this function must not do.
+                */
+               if ((fd = dup(fd)) == -1) {
+                       mandoc_vmsg(MANDOCERR_FILE, curp, 0, 0,
+                           "dup: %s", strerror(errno));
+                       return 0;
+               }
+               if ((gz = gzdopen(fd, "rb")) == NULL) {
+                       mandoc_vmsg(MANDOCERR_FILE, curp, 0, 0,
+                           "gzdopen: %s", strerror(errno));
+                       close(fd);
+                       return 0;
+               }

        } else
                gz = NULL;
 
        } else
                gz = NULL;
 


@@ -611,6 +614,7 @@ read_whole_file(struct mparse *curp, const char *file, int fd,
 
        *with_mmap = 0;
        off = 0;
 
        *with_mmap = 0;
        off = 0;

+       retval = 0;

        fb->sz = 0;
        fb->buf = NULL;
        for (;;) {
        fb->sz = 0;
        fb->buf = NULL;
        for (;;) {


@@ -627,16 +631,29 @@ read_whole_file(struct mparse *curp, const char *file, int fd,
                    read(fd, fb->buf + (int)off, fb->sz - off);
                if (ssz == 0) {
                        fb->sz = off;
                    read(fd, fb->buf + (int)off, fb->sz - off);
                if (ssz == 0) {
                        fb->sz = off;

-                       return 1;
+                       retval = 1;
+                       break;
+               }
+               if (ssz == -1) {
+                       if (curp->gzip)
+                               (void)gzerror(gz, &gzerrnum);
+                       mandoc_vmsg(MANDOCERR_FILE, curp, 0, 0, "read: %s",
+                           curp->gzip && gzerrnum != Z_ERRNO ?
+                           zError(gzerrnum) : strerror(errno));
+                       break;

                }
                }

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

                off += (size_t)ssz;
        }
 
                off += (size_t)ssz;
        }
 

-       free(fb->buf);
-       fb->buf = NULL;
-       return 0;
+       if (curp->gzip && (gzerrnum = gzclose(gz)) != Z_OK)
+               mandoc_vmsg(MANDOCERR_FILE, curp, 0, 0, "gzclose: %s",
+                   gzerrnum == Z_ERRNO ? strerror(errno) :
+                   zError(gzerrnum));
+       if (retval == 0) {
+               free(fb->buf);
+               fb->buf = NULL;
+       }
+       return retval;

 }
 
 static void
 }
 
 static void