===================================================================
RCS file: /cvs/mandoc/Attic/mlg.c,v
retrieving revision 1.2
retrieving revision 1.7
diff -u -p -r1.2 -r1.7
--- mandoc/Attic/mlg.c	2008/12/03 19:21:58	1.2
+++ mandoc/Attic/mlg.c	2008/12/04 19:31:57	1.7
@@ -1,4 +1,4 @@
-/* $Id: mlg.c,v 1.2 2008/12/03 19:21:58 kristaps Exp $ */
+/* $Id: mlg.c,v 1.7 2008/12/04 19:31:57 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -63,18 +63,23 @@ struct	md_mlg {
 
 static	void		 mlg_roffmsg(void *arg, enum roffmsg, 
 				const char *, const char *, char *);
-static	int		 mlg_roffhead(void *);
+static	int		 mlg_roffhead(void *, const struct tm *, 
+				const char *, const char *, 
+				const char *, const char *);
 static	int		 mlg_rofftail(void *);
 static	int		 mlg_roffin(void *, int, int *, char **);
-static	int		 mlg_roffdata(void *, int, char *);
+static	int		 mlg_roffdata(void *, int, 
+				const char *, char *);
 static	int		 mlg_roffout(void *, int);
 static	int		 mlg_roffblkin(void *, int, int *, char **);
 static	int		 mlg_roffblkout(void *, int);
 static	int		 mlg_roffspecial(void *, int, int *, 
 				char **, char **);
-static	int		 mlg_roffblkheadin(void *, int, int *, char **);
+static	int		 mlg_roffblkheadin(void *, int, 
+				int *, char **);
 static	int		 mlg_roffblkheadout(void *, int);
-static	int		 mlg_roffblkbodyin(void *, int, int *, char **);
+static	int		 mlg_roffblkbodyin(void *, int, 
+				int *, char **);
 static	int		 mlg_roffblkbodyout(void *, int);
 
 static	int		 mlg_beginblk(struct md_mlg *, enum md_ns, int, 
@@ -86,7 +91,14 @@ static	int		 mlg_endtag(struct md_mlg *, enum md_ns, i
 static	int	  	 mlg_indent(struct md_mlg *);
 static	int		 mlg_newline(struct md_mlg *);
 static	void		 mlg_mode(struct md_mlg *, enum md_tok);
-static	int		 mlg_data(struct md_mlg *, int, char *);
+static	int		 mlg_data(struct md_mlg *, int, 
+				const char *, char *);
+static	void		 mlg_err(struct md_mlg *, const char *, 
+				const char *, char *);
+static	void		 mlg_warn(struct md_mlg *, const char *, 
+				const char *, char *);
+static	void		 mlg_msg(struct md_mlg *, enum roffmsg, 
+				const char *, const char *, char *);
 
 #ifdef __linux__
 extern	size_t		 strlcat(char *, const char *, size_t);
@@ -189,7 +201,7 @@ mlg_indent(struct md_mlg *p)
 {
 	size_t		 count;
 
-	count = p->indent > MAXINDENT ? MAXINDENT : p->indent;
+	count = p->indent > MAXINDENT ? (size_t)MAXINDENT : p->indent;
 	count *= INDENT;
 
 	assert(0 == p->pos);
@@ -212,16 +224,18 @@ mlg_newline(struct md_mlg *p)
 static void
 mlg_mode(struct md_mlg *p, enum md_tok ns)
 {
+
 	p->flags &= ~ML_OVERRIDE_ONE;
 	p->last = ns;
 }
 
 
 static int
-mlg_data(struct md_mlg *p, int space, char *buf)
+mlg_data(struct md_mlg *p, int space, const char *start, char *buf)
 {
 	size_t		 sz;
 	char		*bufp;
+	int		 c;
 
 	assert(p->mbuf);
 	assert(0 != p->indent);
@@ -249,10 +263,20 @@ mlg_data(struct md_mlg *p, int space, char *buf)
 		if (0 == p->pos) {
 			if ( ! mlg_indent(p))
 				return(0);
-			if ( ! ml_nputstring(p->mbuf, bufp, 
-						sz, &p->pos))
+
+			c = ml_nputstring(p->mbuf, bufp, sz, &p->pos);
+			if (0 == c) {
+				mlg_err(p, start, bufp, "invalid "
+						"character sequence");
 				return(0);
-			if (p->indent * MAXINDENT + sz >= COLUMNS)
+			} else if (c > 1) {
+				mlg_warn(p, start, bufp, "bogus "
+						"character sequence");
+				return(0);
+			} else if (-1 == c)
+				return(0);
+
+			if (p->indent * INDENT + sz >= COLUMNS)
 				if ( ! mlg_newline(p))
 					return(0);
 			if ( ! (ML_OVERRIDE_ALL & p->flags))
@@ -270,8 +294,17 @@ mlg_data(struct md_mlg *p, int space, char *buf)
 				return(0);
 		}
 
-		if ( ! ml_nputstring(p->mbuf, bufp, sz, &p->pos))
+		c = ml_nputstring(p->mbuf, bufp, sz, &p->pos);
+		if (0 == c) {
+			mlg_err(p, start, bufp, "invalid "
+					"character sequence");
 			return(0);
+		} else if (c > 1) {
+			mlg_warn(p, start, bufp, "bogus "
+					"character sequence");
+			return(0);
+		} else if (-1 == c)
+			return(0);
 
 		if ( ! (ML_OVERRIDE_ALL & p->flags))
 			space = 1;
@@ -345,7 +378,8 @@ mlg_alloc(const struct md_args *args, 
 
 
 static int
-mlg_roffhead(void *arg)
+mlg_roffhead(void *arg, const struct tm *tm, const char *os, 
+		const char *title, const char *sec, const char *vol)
 {
 	struct md_mlg	*p;
 
@@ -353,7 +387,7 @@ mlg_roffhead(void *arg)
 	p = (struct md_mlg *)arg;
 
 	mlg_mode(p, MD_BLK_IN);
-	if ( ! (*p->begin)(p->mbuf, p->args))
+	if ( ! (*p->begin)(p->mbuf, p->args, tm, os, title, sec, vol))
 		return(0);
 
 	p->indent++;
@@ -510,12 +544,49 @@ static void
 mlg_roffmsg(void *arg, enum roffmsg lvl, 
 		const char *buf, const char *pos, char *msg)
 {
-	char		*level;
+
+	mlg_msg((struct md_mlg *)arg, lvl, buf, pos, msg);
+}
+
+
+static int
+mlg_roffdata(void *arg, int space, const char *start, char *buf)
+{
 	struct md_mlg	*p;
 
 	assert(arg);
 	p = (struct md_mlg *)arg;
 
+	if ( ! mlg_data(p, space, start, buf))
+		return(0);
+
+	mlg_mode(p, MD_TEXT);
+	return(1);
+}
+
+
+static void
+mlg_err(struct md_mlg *p, const char *buf, const char *pos, char *msg)
+{
+
+	mlg_msg(p, ROFF_ERROR, buf, pos, msg);
+}
+
+
+static void
+mlg_warn(struct md_mlg *p, const char *buf, const char *pos, char *msg)
+{
+
+	mlg_msg(p, ROFF_WARN, buf, pos, msg);
+}
+
+
+static void
+mlg_msg(struct md_mlg *p, enum roffmsg lvl, 
+		const char *buf, const char *pos, char *msg)
+{
+	char		*level;
+
 	switch (lvl) {
 	case (ROFF_WARN):
 		if ( ! (MD_WARN_ALL & p->args->warnings))
@@ -538,20 +609,3 @@ mlg_roffmsg(void *arg, enum roffmsg lvl, 
 				p->rbuf->name, level, msg);
 
 }
-
-
-static int
-mlg_roffdata(void *arg, int space, char *buf)
-{
-	struct md_mlg	*p;
-
-	assert(arg);
-	p = (struct md_mlg *)arg;
-
-	if ( ! mlg_data(p, space, buf))
-		return(0);
-
-	mlg_mode(p, MD_TEXT);
-	return(1);
-}
-