=================================================================== RCS file: /cvs/mandoc/read.c,v retrieving revision 1.141 retrieving revision 1.149 diff -u -p -r1.141 -r1.149 --- mandoc/read.c 2015/09/14 15:36:14 1.141 +++ mandoc/read.c 2016/07/10 13:34:30 1.149 @@ -1,7 +1,7 @@ -/* $Id: read.c,v 1.141 2015/09/14 15:36:14 schwarze Exp $ */ +/* $Id: read.c,v 1.149 2016/07/10 13:34:30 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons - * Copyright (c) 2010-2015 Ingo Schwarze + * Copyright (c) 2010-2016 Ingo Schwarze * Copyright (c) 2010, 2012 Joerg Sonnenberger * * Permission to use, copy, modify, and distribute this software for any @@ -26,6 +26,9 @@ #include #include +#if HAVE_ERR +#include +#endif #include #include #include @@ -49,7 +52,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 */ @@ -215,6 +217,7 @@ static const char * const mandocerrs[MANDOCERR_MAX] = /* 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 manual name, using \"\"", "uname(3) system call failed, using UNKNOWN", @@ -536,9 +539,9 @@ rerun: if (curp->secondary) curp->secondary->sz -= pos + 1; save_file = curp->file; - 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); + close(fd); curp->file = save_file; } else { curp->file = save_file; @@ -612,11 +615,10 @@ read_whole_file(struct mparse *curp, const char *file, #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 * via mmap(). This is faster than reading it into blocks, and @@ -627,21 +629,19 @@ read_whole_file(struct mparse *curp, const char *file, 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 +668,16 @@ read_whole_file(struct mparse *curp, const char *file, read(fd, fb->buf + (int)off, fb->sz - off); if (ssz == 0) { fb->sz = off; - return(1); + return 1; } - if (ssz == -1) { - perror(file); - exit((int)MANDOCLEVEL_SYSERR); - } + 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 +746,7 @@ mparse_readmem(struct mparse *curp, void *buf, size_t blk.sz = len; mparse_parse_buffer(curp, blk, file); - return(curp->file_status); + return curp->file_status; } /* @@ -775,17 +773,14 @@ mparse_readfd(struct mparse *curp, int fd, const char #endif free(blk.buf); } - - if (fd != STDIN_FILENO && close(fd) == -1) - perror(file); - - 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) { char *cp; + int fd; curp->file = file; cp = strrchr(file, '.'); @@ -793,8 +788,8 @@ mparse_open(struct mparse *curp, int *fd, const char * /* First try to use the filename as it is. */ - if ((*fd = open(file, O_RDONLY)) != -1) - return(MANDOCLEVEL_OK); + if ((fd = open(file, O_RDONLY)) != -1) + return fd; /* * If that doesn't work and the filename doesn't @@ -803,23 +798,23 @@ mparse_open(struct mparse *curp, int *fd, const char * if ( ! curp->gzip) { mandoc_asprintf(&cp, "%s.gz", file); - *fd = open(file, O_RDONLY); + fd = open(cp, O_RDONLY); free(cp); - if (*fd != -1) { + if (fd != -1) { curp->gzip = 1; - return(MANDOCLEVEL_OK); + return fd; } } /* Neither worked, give up. */ mandoc_msg(MANDOCERR_FILE, curp, 0, 0, strerror(errno)); - return(MANDOCLEVEL_ERROR); + return -1; } 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, man 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, man 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; }