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 fd7b5ce1b8bb0a44078828ff04ea6488805a5485..13b25778d740e1f365907736ed8ea30574b1d30d 100644 (file)
--- a/read.c
+++ b/read.c
@@ -1,4 +1,4 @@
-/*     $Id: read.c,v 1.141 2015/09/14 15:36:14 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>
@@ -26,6 +26,7 @@
 
 #include <assert.h>
 #include <ctype.h>
+#include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
@@ -49,7 +50,6 @@
 struct mparse {
        struct roff_man  *man; /* man parser */
        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 */
@@ -612,10 +612,9 @@ read_whole_file(struct mparse *curp, const char *file, int fd,
 
 #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
@@ -627,21 +626,19 @@ read_whole_file(struct mparse *curp, const char *file, int fd,
        if (curp->gzip == 0 && S_ISREG(st.st_mode)) {
                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)
-                       return(1);
+                       return 1;
        }
 #endif
 
        if (curp->gzip) {
-               if ((gz = gzdopen(fd, "rb")) == NULL) {
-                       perror(file);
-                       exit((int)MANDOCLEVEL_SYSERR);
-               }
+               if ((gz = gzdopen(fd, "rb")) == NULL)
+                       err((int)MANDOCLEVEL_SYSERR, "%s", file);
        } else
                gz = NULL;
 
@@ -668,18 +665,16 @@ 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;
-                       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;
-       return(0);
+       return 0;
 }
 
 static void
@@ -748,7 +743,7 @@ mparse_readmem(struct mparse *curp, void *buf, size_t len,
        blk.sz = len;
 
        mparse_parse_buffer(curp, blk, file);
-       return(curp->file_status);
+       return curp->file_status;
 }
 
 /*
@@ -779,7 +774,7 @@ mparse_readfd(struct mparse *curp, int fd, const char *file)
        if (fd != STDIN_FILENO && close(fd) == -1)
                perror(file);
 
-       return(curp->file_status);
+       return curp->file_status;
 }
 
 enum mandoclevel
@@ -794,7 +789,7 @@ mparse_open(struct mparse *curp, int *fd, const char *file)
        /* First try to use the filename as it is. */
 
        if ((*fd = open(file, O_RDONLY)) != -1)
-               return(MANDOCLEVEL_OK);
+               return MANDOCLEVEL_OK;
 
        /*
         * If that doesn't work and the filename doesn't
@@ -807,19 +802,19 @@ mparse_open(struct mparse *curp, int *fd, const char *file)
                free(cp);
                if (*fd != -1) {
                        curp->gzip = 1;
-                       return(MANDOCLEVEL_OK);
+                       return MANDOCLEVEL_OK;
                }
        }
 
        /* Neither worked, give up. */
 
        mandoc_msg(MANDOCERR_FILE, curp, 0, 0, strerror(errno));
-       return(MANDOCLEVEL_ERROR);
+       return MANDOCLEVEL_ERROR;
 }
 
 struct mparse *
 mparse_alloc(int options, enum mandoclevel wlevel, mandocmsg mmsg,
-    const struct mchars *mchars, const char *defos)
+    const char *defos)
 {
        struct mparse   *curp;
 
@@ -830,8 +825,7 @@ mparse_alloc(int options, enum mandoclevel wlevel, mandocmsg mmsg,
        curp->mmsg = mmsg;
        curp->defos = defos;
 
-       curp->mchars = mchars;
-       curp->roff = roff_alloc(curp, curp->mchars, options);
+       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) {
@@ -842,7 +836,7 @@ mparse_alloc(int options, enum mandoclevel wlevel, mandocmsg mmsg,
                curp->man->macroset = MACROSET_MAN;
        }
        curp->man->first->tok = TOKEN_NONE;
-       return(curp);
+       return curp;
 }
 
 void
@@ -928,13 +922,13 @@ const char *
 mparse_strerror(enum mandocerr er)
 {
 
-       return(mandocerrs[er]);
+       return mandocerrs[er];
 }
 
 const char *
 mparse_strlevel(enum mandoclevel lvl)
 {
-       return(mandoclevels[lvl]);
+       return mandoclevels[lvl];
 }
 
 void
@@ -950,5 +944,5 @@ mparse_getkeep(const struct mparse *p)
 {
 
        assert(p->secondary);
-       return(p->secondary->sz ? p->secondary->buf : NULL);
+       return p->secondary->sz ? p->secondary->buf : NULL;
 }