===================================================================
RCS file: /cvs/mandoc/Attic/ml.c,v
retrieving revision 1.1
retrieving revision 1.4
diff -u -p -r1.1 -r1.4
--- mandoc/Attic/ml.c	2008/12/02 18:26:57	1.1
+++ mandoc/Attic/ml.c	2008/12/04 16:19:52	1.4
@@ -1,4 +1,4 @@
-/* $Id: ml.c,v 1.1 2008/12/02 18:26:57 kristaps Exp $ */
+/* $Id: ml.c,v 1.4 2008/12/04 16:19:52 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -21,164 +21,100 @@
 
 #include "libmdocml.h"
 #include "private.h"
+#include "ml.h"
 
+#ifdef __linux__
+extern	size_t		  strlcat(char *, const char *, size_t);
+extern	size_t		  strlcpy(char *, const char *, size_t);
+#endif
 
-#define	MAXINDENT	 8
 
-static ssize_t		 ml_puts(struct md_mbuf *, const char *);
-static ssize_t		 ml_putchar(struct md_mbuf *, char);
-static ssize_t		 ml_putstring(struct md_mbuf *, const char *);
-
-
-static ssize_t
-ml_puts(struct md_mbuf *p, const char *buf)
+int
+ml_nputstring(struct md_mbuf *p, 
+		const char *buf, size_t sz, size_t *pos)
 {
-
-	return(ml_nputs(p, buf, strlen(buf)));
-}
-
-
-static ssize_t
-ml_putchar(struct md_mbuf *p, char buf)
-{
-
-	return(ml_nputs(p, &buf, 1));
-}
-
-
-static ssize_t
-ml_putstring(struct md_mbuf *p, const char *buf)
-{
-	
-	return(ml_nputstring(p, buf, strlen(buf)));
-}
-
-
-ssize_t
-ml_begintag(struct md_mbuf *p, const char *name, 
-		int *argc, char **argv)
-{
 	int		 i;
-	ssize_t		 res, sz;
+	const char	*seq;
+	size_t		 ssz;
 
-	res = 0;
+	for (i = 0; i < (int)sz; i++) {
+		switch (buf[i]) {
 
-	if (-1 == (sz = ml_nputs(p, "<", 1)))
-		return(-1);
-	res += sz;
+		/* Ampersand ml-escape. */
+		case ('&'):
+			seq = "&amp;";
+			ssz = 5;
+			break;
 
-	if (-1 == (sz = ml_puts(p, name)))
-		return(-1);
-	res += sz;
+		/* Quotation ml-escape. */
+		case ('"'):
+			seq = "&quot;";
+			ssz = 6;
+			break;
 
-	for (i = 0; ROFF_ARGMAX != argc[i]; i++) {
-		if (-1 == (sz = ml_nputs(p, " ", 1)))
-			return(-1);
-		res += sz;
+		/* Lt ml-escape. */
+		case ('<'):
+			seq = "&lt;";
+			ssz = 4;
+			break;
 
-		if (-1 == (sz = ml_puts(p, tokargnames[argc[i]])))
-			return(-1);
-		res += sz;
+		/* Gt ml-escape. */
+		case ('>'):
+			seq = "&gt;";
+			ssz = 4;
+			break;
 
-		if (-1 == (sz = ml_nputs(p, "=\"", 2)))
-			return(-1);
-		res += sz;
+		default:
+			seq = &buf[i];
+			ssz = 1;
+			break;
+		}
 
-		if (-1 == (sz = ml_putstring(p, argv[i] ? 
-						argv[i] : "true")))
+		if ( ! ml_nputs(p, seq, ssz, pos))
 			return(-1);
-		res += sz;
-
-		if (-1 == (sz = ml_nputs(p, "\"", 1)))
-			return(-1);
-		res += sz;
 	}
-	
-	if (-1 == (sz = ml_nputs(p, ">", 1)))
-		return(-1);
-
-	return(res + sz);
+	return(1);
 }
 
 
-ssize_t
-ml_endtag(struct md_mbuf *p, const char *tag)
+int
+ml_nputs(struct md_mbuf *p, const char *buf, size_t sz, size_t *pos)
 {
-	ssize_t		 res, sz;
 
-	res = 0;
+	if (0 == sz)
+		return(1);
 
-	if (-1 == (sz = ml_nputs(p, "</", 2)))
-		return(-1);
-	res += sz;
+	if ( ! md_buf_puts(p, buf, sz))
+		return(0);
 
-	if (-1 == (sz = ml_puts(p, tag)))
-		return(-1);
-	res += sz;
-
-	if (-1 == (sz = ml_nputs(p, ">", 1)))
-		return(-1);
-
-	return(res + sz);
+	*pos += sz;
+	return(1);
 }
 
 
-ssize_t
-ml_nputstring(struct md_mbuf *p, const char *buf, size_t bufsz)
+int
+ml_puts(struct md_mbuf *p, const char *buf, size_t *pos)
 {
-	int		 i;
-	ssize_t		 res, sz;
+	size_t		 sz;
 
-	res = 0;
+	if (0 == (sz = strlen(buf)))
+		return(1);
 
-	for (i = 0; i < (int)bufsz; i++) {
-		switch (buf[i]) {
-		case ('&'):
-			if (-1 == (sz = ml_nputs(p, "&amp;", 5)))
-				return(-1);
-			break;
-		case ('"'):
-			if (-1 == (sz = ml_nputs(p, "&quot;", 6)))
-				return(-1);
-			break;
-		case ('<'):
-			if (-1 == (sz = ml_nputs(p, "&lt;", 4)))
-				return(-1);
-			break;
-		case ('>'):
-			if (-1 == (sz = ml_nputs(p, "&gt;", 4)))
-				return(-1);
-			break;
-		default:
-			if (-1 == (sz = ml_putchar(p, buf[i])))
-				return(-1);
-			break;
-		}
-		res += sz;
-	}
-	return(res);
+	if ( ! md_buf_puts(p, buf, sz))
+		return(0);
+	*pos += sz;
+	return(1);
 }
 
 
-ssize_t
-ml_nputs(struct md_mbuf *p, const char *buf, size_t sz)
+int
+ml_putchars(struct md_mbuf *p, char buf, size_t count, size_t *pos)
 {
-
-	return(0 == md_buf_puts(p, buf, sz) ? -1 : (ssize_t)sz);
-}
-
-
-ssize_t
-ml_indent(struct md_mbuf *p, int indent)
-{
 	size_t		 i;
-	ssize_t		 res, sz;
 
-	res = sz  0;
+	for (i = 0; i < count; i++)
+		if ( ! ml_nputs(p, &buf, 1, pos))
+			return(0);
 
-	/* LINTED */
-	for (i = 0; i < MIN(indent, MAXINDENT); i++, res += sz)
-		if (-1 == (sz = ml_nputs(p, "    ", 4)))
-			return(-1);
-	return(res);
+	return(1);
 }