===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/read.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- src/usr.bin/mandoc/read.c	2014/01/02 16:29:46	1.18
+++ src/usr.bin/mandoc/read.c	2014/01/05 20:26:27	1.19
@@ -1,4 +1,4 @@
-/*	$Id: read.c,v 1.18 2014/01/02 16:29:46 schwarze Exp $ */
+/*	$Id: read.c,v 1.19 2014/01/05 20:26:27 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -52,10 +52,10 @@
 	struct roff	 *roff; /* roff parser (!NULL) */
 	int		  reparse_count; /* finite interp. stack */
 	mandocmsg	  mmsg; /* warning/error message handler */
-	void		 *arg; /* argument to mmsg */
 	const char	 *file; 
 	struct buf	 *secondary;
 	char		 *defos; /* default operating system */
+	int		  quick; /* abort the parse early */
 };
 
 static	void	  resize_buf(struct buf *, size_t);
@@ -250,13 +250,14 @@
 	case (MPARSE_MDOC):
 		if (NULL == curp->pmdoc) 
 			curp->pmdoc = mdoc_alloc(curp->roff, curp,
-					curp->defos);
+					curp->defos, curp->quick);
 		assert(curp->pmdoc);
 		curp->mdoc = curp->pmdoc;
 		return;
 	case (MPARSE_MAN):
 		if (NULL == curp->pman) 
-			curp->pman = man_alloc(curp->roff, curp);
+			curp->pman = man_alloc(curp->roff, curp,
+					curp->quick);
 		assert(curp->pman);
 		curp->man = curp->pman;
 		return;
@@ -267,14 +268,14 @@
 	if (pos >= 3 && 0 == memcmp(buf, ".Dd", 3))  {
 		if (NULL == curp->pmdoc) 
 			curp->pmdoc = mdoc_alloc(curp->roff, curp,
-					curp->defos);
+					curp->defos, curp->quick);
 		assert(curp->pmdoc);
 		curp->mdoc = curp->pmdoc;
 		return;
 	} 
 
 	if (NULL == curp->pman) 
-		curp->pman = man_alloc(curp->roff, curp);
+		curp->pman = man_alloc(curp->roff, curp, curp->quick);
 	assert(curp->pman);
 	curp->man = curp->pman;
 }
@@ -552,7 +553,8 @@
 		if (0 == rc) {
 			assert(MANDOCLEVEL_FATAL <= curp->file_status);
 			break;
-		}
+		} else if (2 == rc)
+			break;
 
 		/* Temporary buffers typically are not full. */
 
@@ -738,7 +740,7 @@
 
 struct mparse *
 mparse_alloc(enum mparset inttype, enum mandoclevel wlevel,
-		mandocmsg mmsg, void *arg, char *defos)
+		mandocmsg mmsg, char *defos, int quick)
 {
 	struct mparse	*curp;
 
@@ -748,9 +750,9 @@
 
 	curp->wlevel = wlevel;
 	curp->mmsg = mmsg;
-	curp->arg = arg;
 	curp->inttype = inttype;
 	curp->defos = defos;
+	curp->quick = quick;
 
 	curp->roff = roff_alloc(inttype, curp);
 	return(curp);