===================================================================
RCS file: /cvs/mandoc/Attic/libmdocml.c,v
retrieving revision 1.3
retrieving revision 1.5
diff -u -p -r1.3 -r1.5
--- mandoc/Attic/libmdocml.c	2008/11/22 20:15:34	1.3
+++ mandoc/Attic/libmdocml.c	2008/11/23 16:53:18	1.5
@@ -1,4 +1,4 @@
-/* $Id: libmdocml.c,v 1.3 2008/11/22 20:15:34 kristaps Exp $ */
+/* $Id: libmdocml.c,v 1.5 2008/11/23 16:53:18 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -25,58 +25,18 @@
 #include <unistd.h>
 
 #include "libmdocml.h"
+#include "private.h"
 
 #define	BUFFER_LINE	 BUFSIZ
 
-struct	md_rbuf {
-	int		 fd;
-	char		*name;
-	char		*buf;
-	size_t		 bufsz;
-	size_t		 line;
-};
+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 *);
 
-struct	md_mbuf {
-	int		 fd;
-	char		*name;
-	char		*buf;
-	size_t		 bufsz;
-	size_t		 pos;
-};
 
-typedef int (*md_line)	(const struct md_args *, struct md_mbuf *, 
-				const struct md_rbuf *,
-				const char *, size_t);
-typedef int (*md_init)	(const struct md_args *, struct md_mbuf *);
-typedef int (*md_exit)	(const struct md_args *, struct md_mbuf *);
-
-static int		 md_line_dummy(const struct md_args *,
-				struct md_mbuf *, 
-				const struct md_rbuf *, 
-				const char *, size_t);
-
-static int		 md_line_html4_strict(const struct md_args *,
-				struct md_mbuf *, 
-				const struct md_rbuf *,
-				const char *, size_t);
-static int		 md_init_html4_strict(const struct md_args *,
-				struct md_mbuf *);
-static int		 md_exit_html4_strict(const struct md_args *,
-				struct md_mbuf *);
-
-static int		 md_run_enter(const struct md_args *, 
-				struct md_mbuf *, struct md_rbuf *);
-static int		 md_run_leave(const struct md_args *, 
-				struct md_mbuf *, 
-				struct md_rbuf *, int);
-
-static ssize_t		 md_buf_fill(struct md_rbuf *);
-static int		 md_buf_flush(struct md_mbuf *);
-static int		 md_buf_putchar(struct md_mbuf *, char);
-static int		 md_buf_puts(struct md_mbuf *, 
-				const char *, size_t);
-
-
 static ssize_t
 md_buf_fill(struct md_rbuf *in)
 {
@@ -121,14 +81,21 @@ md_buf_flush(struct md_mbuf *buf)
 }
 
 
-static int
+int
 md_buf_putchar(struct md_mbuf *buf, char c)
 {
 	return(md_buf_puts(buf, &c, 1));
 }
 
 
-static int
+int
+md_buf_putstring(struct md_mbuf *buf, const char *p)
+{
+	return(md_buf_puts(buf, p, strlen(p)));
+}
+
+
+int
 md_buf_puts(struct md_mbuf *buf, const char *p, size_t sz)
 {
 	size_t		 ssz;
@@ -158,8 +125,8 @@ md_buf_puts(struct md_mbuf *buf, const char *p, size_t
 
 
 static int
-md_run_leave(const struct md_args *args, 
-		struct md_mbuf *mbuf, struct md_rbuf *rbuf, int c)
+md_run_leave(const struct md_args *args, struct md_mbuf *mbuf, 
+		struct md_rbuf *rbuf, int c, void *data)
 {
 	assert(args);
 	assert(mbuf);
@@ -168,7 +135,7 @@ md_run_leave(const struct md_args *args, 
 	/* Run exiters. */
 	switch (args->type) {
 	case (MD_HTML4_STRICT):
-		if ( ! md_exit_html4_strict(args, mbuf))
+		if ( ! md_exit_html4_strict(args, mbuf, rbuf, data))
 			return(-1);
 		break;
 	case (MD_DUMMY):
@@ -186,8 +153,8 @@ md_run_leave(const struct md_args *args, 
 
 
 static int
-md_run_enter(const struct md_args *args, 
-		struct md_mbuf *mbuf, struct md_rbuf *rbuf)
+md_run_enter(const struct md_args *args, struct md_mbuf *mbuf, 
+		struct md_rbuf *rbuf, void *p)
 {
 	ssize_t		 sz, i;
 	char		 line[BUFFER_LINE];
@@ -213,14 +180,15 @@ md_run_enter(const struct md_args *args, 
 	/* LINTED */
 	for (pos = 0; ; ) {
 		if (-1 == (sz = md_buf_fill(rbuf)))
-			return(-1);
+			return(md_run_leave(args, mbuf, rbuf, -1, p));
 		else if (0 == sz)
 			break;
 
 		for (i = 0; i < sz; i++) {
 			if ('\n' == rbuf->buf[i]) {
-				if ( ! (*fp)(args, mbuf, rbuf, line, pos))
-					return(-1);
+				if ( ! (*fp)(args, mbuf, rbuf, line, pos, p))
+					return(md_run_leave(args, mbuf, rbuf,
+								-1, p));
 				rbuf->line++;
 				pos = 0;
 				continue;
@@ -234,14 +202,14 @@ md_run_enter(const struct md_args *args, 
 
 			warnx("%s: line %zu too long",
 					rbuf->name, rbuf->line);
-			return(-1);
+			return(md_run_leave(args, mbuf, rbuf, -1, p));
 		}
 	}
 
-	if (0 != pos && ! (*fp)(args, mbuf, rbuf, line, pos))
-		return(-1);
+	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));
+	return(md_run_leave(args, mbuf, rbuf, 0, p));
 }
 
 
@@ -251,6 +219,7 @@ md_run(const struct md_args *args,
 {
 	struct md_mbuf	 mbuf;
 	struct md_rbuf	 rbuf;
+	void		*data;
 
 	assert(args);
 	assert(in);
@@ -261,11 +230,13 @@ 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))
+		if ( ! md_init_html4_strict
+				(args, &mbuf, &rbuf, &data))
 			return(-1);
 		break;
 	case (MD_DUMMY):
@@ -275,59 +246,5 @@ md_run(const struct md_args *args,
 	}
 
 	/* Go into mainline. */
-	return(md_run_enter(args, &mbuf, &rbuf));
-}
-
-
-static int
-md_line_dummy(const struct md_args *args, struct md_mbuf *out, 
-		const struct md_rbuf *in, const char *buf, size_t sz)
-{
-
-	assert(buf);
-	assert(out);
-	assert(in);
-	assert(args);
-
-	if ( ! md_buf_puts(out, buf, sz))
-		return(0);
-	if ( ! md_buf_putchar(out, '\n'))
-		return(0);
-
-	return(1);
-}
-
-
-static int
-md_exit_html4_strict(const struct md_args *args, struct md_mbuf *p) 
-{
-
-	assert(p);
-	assert(args);
-	return(1);
-}
-
-
-static int
-md_init_html4_strict(const struct md_args *args, struct md_mbuf *p) 
-{
-
-	assert(p);
-	assert(args);
-	return(1);
-}
-
-
-static int
-md_line_html4_strict(const struct md_args *args, struct md_mbuf *out, 
-		const struct md_rbuf *in, const char *buf, size_t sz)
-{
-
-	assert(args);
-	assert(buf);
-	assert(out);
-	assert(in);
-	(void)sz;
-
-	return(1);
+	return(md_run_enter(args, &mbuf, &rbuf, data));
 }