===================================================================
RCS file: /cvs/mandoc/read.c,v
retrieving revision 1.150.2.7
retrieving revision 1.159
diff -u -p -r1.150.2.7 -r1.159
--- mandoc/read.c	2017/02/03 18:22:30	1.150.2.7
+++ mandoc/read.c	2017/02/03 17:56:59	1.159
@@ -1,4 +1,4 @@
-/*	$Id: read.c,v 1.150.2.7 2017/02/03 18:22:30 schwarze Exp $ */
+/*	$Id: read.c,v 1.159 2017/02/03 17:56:59 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -19,10 +19,8 @@
 #include "config.h"
 
 #include <sys/types.h>
-#if HAVE_MMAP
 #include <sys/mman.h>
 #include <sys/stat.h>
-#endif
 
 #include <assert.h>
 #include <ctype.h>
@@ -50,8 +48,8 @@
 #define	REPARSE_LIMIT	1000
 
 struct	mparse {
-	struct roff	 *roff; /* roff parser (!NULL) */
 	struct roff_man	 *man; /* man parser */
+	struct roff	 *roff; /* roff parser (!NULL) */
 	char		 *sodest; /* filename pointed to by .so */
 	const char	 *file; /* filename of current input file */
 	struct buf	 *primary; /* buffer currently being parsed */
@@ -609,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)
@@ -633,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)
@@ -758,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;
@@ -836,14 +830,13 @@ mparse_reset(struct mparse *curp)
 {
 	roff_reset(curp->roff);
 	roff_man_reset(curp->man);
-
-	free(curp->sodest);
-	curp->sodest = NULL;
-
 	if (curp->secondary)
 		curp->secondary->sz = 0;
 
 	curp->file_status = MANDOCLEVEL_OK;
+
+	free(curp->sodest);
+	curp->sodest = NULL;
 	curp->gzip = 0;
 }
 
@@ -852,7 +845,8 @@ mparse_free(struct mparse *curp)
 {
 
 	roff_man_free(curp->man);
-	roff_free(curp->roff);
+	if (curp->roff)
+		roff_free(curp->roff);
 	if (curp->secondary)
 		free(curp->secondary->buf);