=================================================================== RCS file: /cvs/mandoc/read.c,v retrieving revision 1.150.2.3 retrieving revision 1.159 diff -u -p -r1.150.2.3 -r1.159 --- mandoc/read.c 2017/01/09 02:21:37 1.150.2.3 +++ mandoc/read.c 2017/02/03 17:56:59 1.159 @@ -1,7 +1,7 @@ -/* $Id: read.c,v 1.150.2.3 2017/01/09 02:21:37 schwarze Exp $ */ +/* $Id: read.c,v 1.159 2017/02/03 17:56:59 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons - * Copyright (c) 2010-2016 Ingo Schwarze + * Copyright (c) 2010-2017 Ingo Schwarze * Copyright (c) 2010, 2012 Joerg Sonnenberger * * Permission to use, copy, modify, and distribute this software for any @@ -19,10 +19,8 @@ #include "config.h" #include -#if HAVE_MMAP #include #include -#endif #include #include @@ -110,10 +108,11 @@ static const char * const mandocerrs[MANDOCERR_MAX] = "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", + "missing comma before name", "missing description line, using \"\"", "sections out of conventional order", "duplicate section title", @@ -152,6 +151,7 @@ static const char * const mandocerrs[MANDOCERR_MAX] = "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 \"\"", @@ -177,6 +177,7 @@ static const char * const mandocerrs[MANDOCERR_MAX] = "blank line in fill mode, using .sp", "tab in filled text", "whitespace at end of input line", + "new sentence, new line", "bad comment style", "invalid escape sequence", "undefined string, using \"\"", @@ -606,7 +607,6 @@ read_whole_file(struct mparse *curp, const char *file, size_t off; ssize_t ssz; -#if HAVE_MMAP struct stat st; if (fstat(fd, &st) == -1) @@ -630,7 +630,6 @@ read_whole_file(struct mparse *curp, const char *file, if (fb->buf != MAP_FAILED) return 1; } -#endif if (curp->gzip) { if ((gz = gzdopen(fd, "rb")) == NULL) @@ -755,11 +754,9 @@ mparse_readfd(struct mparse *curp, int fd, const char (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 -#endif free(blk.buf); } return curp->file_status; @@ -840,6 +837,7 @@ mparse_reset(struct mparse *curp) free(curp->sodest); curp->sodest = NULL; + curp->gzip = 0; } void @@ -868,6 +866,13 @@ mparse_result(struct mparse *curp, struct roff_man **m } if (man) *man = curp->man; +} + +void +mparse_updaterc(struct mparse *curp, enum mandoclevel *rc) +{ + if (curp->file_status > *rc) + *rc = curp->file_status; } void