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 8fc671b0fd4da78ce326ce37aad5749e56b0be50..1af1b2836383d0ec15cf6dfea58a3e8fc8023aaa 100644 (file)
--- a/read.c
+++ b/read.c
@@ -1,4 +1,4 @@
-/*     $Id: read.c,v 1.185 2017/07/02 15:31:59 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) 2010-2017 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org>


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


@@ -75,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_STYLE,
+       MANDOCERR_OK,

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


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

+       "lower case character in document title",

        "duplicate RCS id",
        "typo in section name",
        "duplicate RCS id",
        "typo in section name",

+       "unterminated quoted argument",

        "useless macro",
        "consider using OS macro",
        "errnos out of order",
        "duplicate errno",
        "useless macro",
        "consider using OS macro",
        "errnos out of order",
        "duplicate errno",

-       "description line ends with a full stop",
+       "trailing delimiter",

        "no blank before trailing delimiter",
        "no blank before trailing delimiter",

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

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


@@ -154,8 +154,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",
 


@@ -184,7 +182,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",


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

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

-       "bad comment style",

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


@@ -231,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",


@@ -342,7 +339,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;


@@ -533,21 +529,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,8 +557,11 @@ read_whole_file(struct mparse *curp, const char *file, int fd,
        size_t           off;
        ssize_t          ssz;
 
        size_t           off;
        ssize_t          ssz;
 

-       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


@@ -598,8 +583,11 @@ 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);
+               if ((gz = gzdopen(fd, "rb")) == NULL) {
+                       mandoc_vmsg(MANDOCERR_FILE, curp, 0, 0,
+                           "gzdopen: %s", strerror(errno));
+                       return 0;
+               }

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


@@ -628,8 +616,11 @@ read_whole_file(struct mparse *curp, const char *file, int fd,
                        fb->sz = off;
                        return 1;
                }
                        fb->sz = off;
                        return 1;
                }

-               if (ssz == -1)
-                       err((int)MANDOCLEVEL_SYSERR, "%s", file);
+               if (ssz == -1) {
+                       mandoc_vmsg(MANDOCERR_FILE, curp, 0, 0,
+                           "read: %s", strerror(errno));
+                       break;
+               }

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