From e2b46e6ff3d12b2acc6ee6242d562230965e3287 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Fri, 3 Feb 2017 18:22:30 +0000 Subject: merge rev.s 1.159 and 1.160: gzip bugfix and struct mparse cleanup --- read.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/read.c b/read.c index 70fe7e15..f86054e5 100644 --- a/read.c +++ b/read.c @@ -1,4 +1,4 @@ -/* $Id: read.c,v 1.150.2.6 2017/01/28 23:35:05 schwarze Exp $ */ +/* $Id: read.c,v 1.150.2.7 2017/02/03 18:22:30 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010-2017 Ingo Schwarze @@ -50,8 +50,8 @@ #define REPARSE_LIMIT 1000 struct mparse { - struct roff_man *man; /* man parser */ struct roff *roff; /* roff parser (!NULL) */ + struct roff_man *man; /* man parser */ char *sodest; /* filename pointed to by .so */ const char *file; /* filename of current input file */ struct buf *primary; /* buffer currently being parsed */ @@ -836,13 +836,15 @@ 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; } void @@ -850,8 +852,7 @@ mparse_free(struct mparse *curp) { roff_man_free(curp->man); - if (curp->roff) - roff_free(curp->roff); + roff_free(curp->roff); if (curp->secondary) free(curp->secondary->buf); -- cgit v1.2.3-56-ge451