From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from krisdoz.my.domain (schwarze@localhost [127.0.0.1])
	by krisdoz.my.domain (8.14.3/8.14.3) with ESMTP id oB2Kfnug010077
	for <source@mdocml.bsd.lv>; Thu, 2 Dec 2010 15:41:50 -0500 (EST)
Received: (from schwarze@localhost)
	by krisdoz.my.domain (8.14.3/8.14.3/Submit) id oB2Kfkg3002427;
	Thu, 2 Dec 2010 15:41:46 -0500 (EST)
Date: Thu, 2 Dec 2010 15:41:46 -0500 (EST)
Message-Id: <201012022041.oB2Kfkg3002427@krisdoz.my.domain>
X-Mailinglist: mdocml-source
Reply-To: source@mdocml.bsd.lv
MIME-Version: 1.0
From: schwarze@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: Track the parser status both per file (file_status), such that  
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8

Log Message:
-----------
Track the parser status both per file (file_status), such that 
we can for example skip rendering on FATAL parsing errors,
and globally (exit_status), such that we know what to return.
Without this, following files produced no rendered output
once a single file suffered from a FATAL error.
Bug reported by kristaps@, fix by me.

Modified Files:
--------------
    mdocml:
        main.c

Revision Data
-------------
Index: main.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/main.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -Lmain.c -Lmain.c -u -p -r1.114 -r1.115
--- main.c
+++ main.c
@@ -213,6 +213,7 @@ static	void		  version(void) __attribute
 static	int		  woptions(struct curparse *, char *);
 
 static	const char	 *progname;
+static	enum mandoclevel  file_status = MANDOCLEVEL_OK;
 static	enum mandoclevel  exit_status = MANDOCLEVEL_OK;
 
 int
@@ -349,7 +350,7 @@ pfile(const char *file, struct curparse 
 
 	if (-1 == (fd = open(file, O_RDONLY, 0))) {
 		perror(file);
-		exit_status = MANDOCLEVEL_SYSERR;
+		file_status = MANDOCLEVEL_SYSERR;
 		return(0);
 	}
 
@@ -367,7 +368,7 @@ pfile(const char *file, struct curparse 
 	if (-1 == close(fd))
 		perror(file);
 
-	return(MANDOCLEVEL_FATAL > exit_status ? 1 : 0);
+	return(MANDOCLEVEL_FATAL > file_status ? 1 : 0);
 }
 
 
@@ -471,6 +472,7 @@ fdesc(struct curparse *curp)
 
 	curp->mdoc = NULL;
 	curp->man = NULL;
+	file_status = MANDOCLEVEL_OK;
 
 	/* Make sure the mandotory roff parser is initialised. */
 
@@ -483,32 +485,32 @@ fdesc(struct curparse *curp)
 
 	pdesc(curp);
 
-	if (MANDOCLEVEL_FATAL <= exit_status)
+	if (MANDOCLEVEL_FATAL <= file_status)
 		goto cleanup;
 
 	/* NOTE a parser may not have been assigned, yet. */
 
 	if ( ! (curp->man || curp->mdoc)) {
 		fprintf(stderr, "%s: Not a manual\n", curp->file);
-		exit_status = MANDOCLEVEL_FATAL;
+		file_status = MANDOCLEVEL_FATAL;
 		goto cleanup;
 	}
 
 	/* Clean up the parse routine ASTs. */
 
 	if (curp->mdoc && ! mdoc_endparse(curp->mdoc)) {
-		assert(MANDOCLEVEL_FATAL <= exit_status);
+		assert(MANDOCLEVEL_FATAL <= file_status);
 		goto cleanup;
 	}
 
 	if (curp->man && ! man_endparse(curp->man)) {
-		assert(MANDOCLEVEL_FATAL <= exit_status);
+		assert(MANDOCLEVEL_FATAL <= file_status);
 		goto cleanup;
 	}
 
 	assert(curp->roff);
 	if ( ! roff_endparse(curp->roff)) {
-		assert(MANDOCLEVEL_FATAL <= exit_status);
+		assert(MANDOCLEVEL_FATAL <= file_status);
 		goto cleanup;
 	}
 
@@ -517,7 +519,7 @@ fdesc(struct curparse *curp)
 	 * the requested level, do not produce output.
 	 */
 
-	if (MANDOCLEVEL_OK != exit_status && curp->wstop)
+	if (MANDOCLEVEL_OK != file_status && curp->wstop)
 		goto cleanup;
 
 	/* If unset, allocate output dev now (if applicable). */
@@ -592,6 +594,9 @@ fdesc(struct curparse *curp)
 	assert(curp->roff);
 	roff_reset(curp->roff);
 
+	if (exit_status < file_status)
+		exit_status = file_status;
+
 	return;
 }
 
@@ -609,7 +614,7 @@ pdesc(struct curparse *curp)
 	 */
 
 	if ( ! read_whole_file(curp, &blk, &with_mmap)) {
-		exit_status = MANDOCLEVEL_SYSERR;
+		file_status = MANDOCLEVEL_SYSERR;
 		return;
 	}
 
@@ -762,7 +767,7 @@ rerun:
 			pos = 0;
 			continue;
 		case (ROFF_ERR):
-			assert(MANDOCLEVEL_FATAL <= exit_status);
+			assert(MANDOCLEVEL_FATAL <= file_status);
 			break;
 		case (ROFF_SO):
 			if (pfile(ln.buf + of, curp)) {
@@ -798,7 +803,7 @@ rerun:
 					curp->line, ln.buf, of);
 
 			if ( ! rc) {
-				assert(MANDOCLEVEL_FATAL <= exit_status);
+				assert(MANDOCLEVEL_FATAL <= file_status);
 				break;
 			}
 		}
@@ -980,8 +985,8 @@ mmsg(enum mandocerr t, void *arg, int ln
 		fprintf(stderr, ": %s", msg);
 	fputc('\n', stderr);
 
-	if (exit_status < level)
-		exit_status = level;
+	if (file_status < level)
+		file_status = level;
 	
 	return(level < MANDOCLEVEL_FATAL);
 }
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv