===================================================================
RCS file: /cvs/mandoc/Attic/libmdocml.c,v
retrieving revision 1.5
retrieving revision 1.21
diff -u -p -r1.5 -r1.21
--- mandoc/Attic/libmdocml.c	2008/11/23 16:53:18	1.5
+++ mandoc/Attic/libmdocml.c	2008/12/10 14:42:46	1.21
@@ -1,4 +1,4 @@
-/* $Id: libmdocml.c,v 1.5 2008/11/23 16:53:18 kristaps Exp $ */
+/* $Id: libmdocml.c,v 1.21 2008/12/10 14:42:46 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -17,6 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 #include <assert.h>
+#include <ctype.h>
 #include <fcntl.h>
 #include <err.h>
 #include <stdio.h>
@@ -24,15 +25,13 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "libmdocml.h"
 #include "private.h"
 
-#define	BUFFER_LINE	 BUFSIZ
-
 static	int	 md_run_enter(const struct md_args *, 
 			struct md_mbuf *, struct md_rbuf *, void *);
 static	int	 md_run_leave(const struct md_args *, struct md_mbuf *,
 			struct md_rbuf *, int, void *);
+
 static	ssize_t	 md_buf_fill(struct md_rbuf *);
 static	int	 md_buf_flush(struct md_mbuf *);
 
@@ -54,8 +53,7 @@ md_buf_fill(struct md_rbuf *in)
 }
 
 
-static int
-md_buf_flush(struct md_mbuf *buf)
+static int md_buf_flush(struct md_mbuf *buf)
 {
 	ssize_t		 sz;
 
@@ -84,6 +82,8 @@ md_buf_flush(struct md_mbuf *buf)
 int
 md_buf_putchar(struct md_mbuf *buf, char c)
 {
+
+	assert(buf);
 	return(md_buf_puts(buf, &c, 1));
 }
 
@@ -91,6 +91,8 @@ md_buf_putchar(struct md_mbuf *buf, char c)
 int
 md_buf_putstring(struct md_mbuf *buf, const char *p)
 {
+
+	assert(buf);
 	return(md_buf_puts(buf, p, strlen(p)));
 }
 
@@ -128,24 +130,30 @@ static int
 md_run_leave(const struct md_args *args, struct md_mbuf *mbuf, 
 		struct md_rbuf *rbuf, int c, void *data)
 {
+	md_exit		 fp;
+
 	assert(args);
 	assert(mbuf);
 	assert(rbuf);
 
 	/* Run exiters. */
 	switch (args->type) {
-	case (MD_HTML4_STRICT):
-		if ( ! md_exit_html4_strict(args, mbuf, rbuf, data))
-			return(-1);
+	case (MD_HTML):
+		fp = md_exit_html;
 		break;
-	case (MD_DUMMY):
+	case (MD_XML):
+		fp = md_exit_xml;
 		break;
 	default:
-		abort();
+		fp = md_exit_noop;
+		break;
 	}
 
+	if ( ! (*fp)(data, -1 == c ? 0 : 1))
+		c = -1;
+
 	/* Make final flush of buffer. */
-	if ( ! md_buf_flush(mbuf))
+	if (-1 != c && ! md_buf_flush(mbuf))
 		return(-1);
 
 	return(c);
@@ -157,8 +165,8 @@ md_run_enter(const struct md_args *args, struct md_mbu
 		struct md_rbuf *rbuf, void *p)
 {
 	ssize_t		 sz, i;
-	char		 line[BUFFER_LINE];
 	size_t		 pos;
+	char		 line[MD_LINE];
 	md_line		 fp;
 
 	assert(args);
@@ -167,49 +175,50 @@ md_run_enter(const struct md_args *args, struct md_mbu
 
 	/* Function ptrs to line-parsers. */
 	switch (args->type) {
-	case (MD_HTML4_STRICT):
-		fp = md_line_html4_strict;
+	case (MD_HTML):
+		fp = md_line_html;
 		break;
-	case (MD_DUMMY):
-		fp = md_line_dummy;
+	case (MD_XML):
+		fp = md_line_xml;
 		break;
 	default:
-		abort();
+		fp = md_line_noop;
+		break;
 	}
 
-	/* LINTED */
-	for (pos = 0; ; ) {
-		if (-1 == (sz = md_buf_fill(rbuf)))
-			return(md_run_leave(args, mbuf, rbuf, -1, p));
-		else if (0 == sz)
-			break;
+	pos = 0;
 
-		for (i = 0; i < sz; i++) {
-			if ('\n' == rbuf->buf[i]) {
-				if ( ! (*fp)(args, mbuf, rbuf, line, pos, p))
-					return(md_run_leave(args, mbuf, rbuf,
-								-1, p));
-				rbuf->line++;
-				pos = 0;
-				continue;
-			}
+again:
+	if (-1 == (sz = md_buf_fill(rbuf))) {
+		return(md_run_leave(args, mbuf, rbuf, -1, p));
+	} else if (0 == sz && 0 != pos) {
+		warnx("%s: no newline at end of file", rbuf->name);
+		return(md_run_leave(args, mbuf, rbuf, -1, p));
+	} else if (0 == sz)
+		return(md_run_leave(args, mbuf, rbuf, 0, p));
 
-			if (pos < BUFFER_LINE) {
+	for (i = 0; i < sz; i++) {
+		if ('\n' != rbuf->buf[i]) {
+			if (pos < MD_LINE) {
 				/* LINTED */
-				line[pos++] = rbuf->buf[i];
+				rbuf->linebuf[pos++] = rbuf->buf[i];
 				continue;
 			}
-
 			warnx("%s: line %zu too long",
 					rbuf->name, rbuf->line);
 			return(md_run_leave(args, mbuf, rbuf, -1, p));
 		}
+
+		rbuf->linebuf[(int)pos] = 0;
+		(void)memcpy(line, rbuf->linebuf, sizeof(line));
+		if ( ! (*fp)(p, line))
+			return(md_run_leave(args, mbuf, rbuf, -1, p));
+		rbuf->line++;
+		pos = 0;
 	}
 
-	if (0 != pos && ! (*fp)(args, mbuf, rbuf, line, pos, p))
-		return(md_run_leave(args, mbuf, rbuf, -1, p));
-
-	return(md_run_leave(args, mbuf, rbuf, 0, p));
+	goto again;
+	/* NOTREACHED */
 }
 
 
@@ -217,6 +226,7 @@ int
 md_run(const struct md_args *args,
 		const struct md_buf *out, const struct md_buf *in)
 {
+	md_init		 fp;
 	struct md_mbuf	 mbuf;
 	struct md_rbuf	 rbuf;
 	void		*data;
@@ -230,20 +240,21 @@ md_run(const struct md_args *args,
 
 	mbuf.pos = 0;
 	rbuf.line = 1;
-	data = NULL;
 
 	/* Run initialisers. */
 	switch (args->type) {
-	case (MD_HTML4_STRICT):
-		if ( ! md_init_html4_strict
-				(args, &mbuf, &rbuf, &data))
-			return(-1);
+	case (MD_HTML):
+		fp = md_init_html;
 		break;
-	case (MD_DUMMY):
+	case (MD_XML):
+		fp = md_init_xml;
 		break;
 	default:
-		abort();
+		fp = md_init_noop;
+		break;
 	}
+
+	data = (*fp)(args, &mbuf, &rbuf);
 
 	/* Go into mainline. */
 	return(md_run_enter(args, &mbuf, &rbuf, data));