===================================================================
RCS file: /cvs/mandoc/man_term.c,v
retrieving revision 1.25
retrieving revision 1.41
diff -u -p -r1.25 -r1.41
--- mandoc/man_term.c	2009/08/19 09:14:50	1.25
+++ mandoc/man_term.c	2009/10/18 19:17:14	1.41
@@ -1,4 +1,4 @@
-/*	$Id: man_term.c,v 1.25 2009/08/19 09:14:50 kristaps Exp $ */
+/*	$Id: man_term.c,v 1.41 2009/10/18 19:17:14 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -14,6 +14,8 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include <sys/types.h>
+
 #include <assert.h>
 #include <ctype.h>
 #include <err.h>
@@ -21,8 +23,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "term.h"
+#include "out.h"
 #include "man.h"
+#include "term.h"
+#include "chars.h"
+#include "main.h"
 
 #define	INDENT		  7
 #define	HALFINDENT	  3
@@ -30,7 +35,21 @@
 struct	mtermp {
 	int		  fl;
 #define	MANT_LITERAL	 (1 << 0)
-	int		  lmargin;
+	/* 
+	 * Default amount to indent the left margin after leading text
+	 * has been printed (e.g., `HP' left-indent, `TP' and `IP' body
+	 * indent).  This needs to be saved because `HP' and so on, if
+	 * not having a specified value, must default.
+	 *
+	 * Note that this is the indentation AFTER the left offset, so
+	 * the total offset is usually offset + lmargin.
+	 */
+	size_t		  lmargin;
+	/*
+	 * The default offset, i.e., the amount between any text and the
+	 * page boundary.
+	 */
+	size_t		  offset;
 };
 
 #define	DECL_ARGS 	  struct termp *p, \
@@ -43,22 +62,39 @@ struct	termact {
 	void		(*post)(DECL_ARGS);
 };
 
+#ifdef __linux__
+extern	size_t		  strlcpy(char *, const char *, size_t);
+extern	size_t		  strlcat(char *, const char *, size_t);
+#endif
+
+static	int		  arg2width(const struct man_node *);
+static	int		  arg2height(const struct man_node *);
+
+static	void		  print_head(struct termp *, 
+				const struct man_meta *);
+static	void		  print_body(DECL_ARGS);
+static	void		  print_node(DECL_ARGS);
+static	void		  print_foot(struct termp *, 
+				const struct man_meta *);
+static	void		  print_bvspace(struct termp *, 
+				const struct man_node *);
+
 static	int		  pre_B(DECL_ARGS);
 static	int		  pre_BI(DECL_ARGS);
-static	int		  pre_BR(DECL_ARGS);
 static	int		  pre_HP(DECL_ARGS);
 static	int		  pre_I(DECL_ARGS);
-static	int		  pre_IB(DECL_ARGS);
 static	int		  pre_IP(DECL_ARGS);
 static	int		  pre_IR(DECL_ARGS);
 static	int		  pre_PP(DECL_ARGS);
 static	int		  pre_RB(DECL_ARGS);
 static	int		  pre_RI(DECL_ARGS);
+static	int		  pre_RS(DECL_ARGS);
 static	int		  pre_SH(DECL_ARGS);
 static	int		  pre_SS(DECL_ARGS);
 static	int		  pre_TP(DECL_ARGS);
 static	int		  pre_br(DECL_ARGS);
 static	int		  pre_fi(DECL_ARGS);
+static	int		  pre_ign(DECL_ARGS);
 static	int		  pre_nf(DECL_ARGS);
 static	int		  pre_r(DECL_ARGS);
 static	int		  pre_sp(DECL_ARGS);
@@ -67,12 +103,13 @@ static	void		  post_B(DECL_ARGS);
 static	void		  post_I(DECL_ARGS);
 static	void		  post_IP(DECL_ARGS);
 static	void		  post_HP(DECL_ARGS);
+static	void		  post_RS(DECL_ARGS);
 static	void		  post_SH(DECL_ARGS);
 static	void		  post_SS(DECL_ARGS);
 static	void		  post_TP(DECL_ARGS);
 static	void		  post_i(DECL_ARGS);
 
-static const struct termact termacts[MAN_MAX] = {
+static	const struct termact termacts[MAN_MAX] = {
 	{ pre_br, NULL }, /* br */
 	{ NULL, NULL }, /* TH */
 	{ pre_SH, post_SH }, /* SH */
@@ -86,63 +123,94 @@ static const struct termact termacts[MAN_MAX] = {
 	{ NULL, NULL }, /* SM */
 	{ pre_B, post_B }, /* SB */
 	{ pre_BI, NULL }, /* BI */
-	{ pre_IB, NULL }, /* IB */
-	{ pre_BR, NULL }, /* BR */
+	{ pre_BI, NULL }, /* IB */
+	{ pre_RB, NULL }, /* BR */
 	{ pre_RB, NULL }, /* RB */
 	{ NULL, NULL }, /* R */
 	{ pre_B, post_B }, /* B */
 	{ pre_I, post_I }, /* I */
 	{ pre_IR, NULL }, /* IR */
 	{ pre_RI, NULL }, /* RI */
-	{ NULL, NULL }, /* na */ /* TODO: document that has no effect */
+	{ NULL, NULL }, /* na */
 	{ pre_I, post_i }, /* i */
 	{ pre_sp, NULL }, /* sp */
 	{ pre_nf, NULL }, /* nf */
 	{ pre_fi, NULL }, /* fi */
 	{ pre_r, NULL }, /* r */
 	{ NULL, NULL }, /* RE */
-	{ NULL, NULL }, /* RS */
+	{ pre_RS, post_RS }, /* RS */
+	{ pre_ign, NULL }, /* DT */
+	{ pre_ign, NULL }, /* UC */
 };
 
-#ifdef __linux__
-extern	size_t		  strlcpy(char *, const char *, size_t);
-extern	size_t		  strlcat(char *, const char *, size_t);
-#endif
 
-static	void		  print_head(struct termp *, 
-				const struct man_meta *);
-static	void		  print_body(DECL_ARGS);
-static	void		  print_node(DECL_ARGS);
-static	void		  print_foot(struct termp *, 
-				const struct man_meta *);
-static	void		  fmt_block_vspace(struct termp *, 
-				const struct man_node *);
-static	int		  arg_width(const struct man_node *);
 
-
-int
-man_run(struct termp *p, const struct man *m)
+void
+terminal_man(void *arg, const struct man *man)
 {
-	struct mtermp	 mt;
+	struct termp		*p;
+	const struct man_node	*n;
+	const struct man_meta	*m;
+	struct mtermp		 mt;
 
-	print_head(p, man_meta(m));
+	p = (struct termp *)arg;
+
+	if (NULL == p->symtab)
+		switch (p->enc) {
+		case (TERMENC_ASCII):
+			p->symtab = chars_init(CHARS_ASCII);
+			break;
+		default:
+			abort();
+			/* NOTREACHED */
+		}
+
+	n = man_node(man);
+	m = man_meta(man);
+
+	print_head(p, m);
 	p->flags |= TERMP_NOSPACE;
-	assert(man_node(m));
-	assert(MAN_ROOT == man_node(m)->type);
 
 	mt.fl = 0;
 	mt.lmargin = INDENT;
+	mt.offset = INDENT;
 
-	if (man_node(m)->child)
-		print_body(p, &mt, man_node(m)->child, man_meta(m));
-	print_foot(p, man_meta(m));
+	if (n->child)
+		print_body(p, &mt, n->child, m);
+	print_foot(p, m);
+}
 
-	return(1);
+
+static int
+arg2height(const struct man_node *n)
+{
+	struct roffsu	 su;
+
+	assert(MAN_TEXT == n->type);
+	assert(n->string);
+	if ( ! a2roffsu(n->string, &su, SCALE_VS))
+		SCALE_VS_INIT(&su, strlen(n->string));
+
+	return((int)term_vspan(&su));
 }
 
 
+static int
+arg2width(const struct man_node *n)
+{
+	struct roffsu	 su;
+
+	assert(MAN_TEXT == n->type);
+	assert(n->string);
+	if ( ! a2roffsu(n->string, &su, SCALE_BU))
+		return(-1);
+
+	return((int)term_hspan(&su));
+}
+
+
 static void
-fmt_block_vspace(struct termp *p, const struct man_node *n)
+print_bvspace(struct termp *p, const struct man_node *n)
 {
 	term_newln(p);
 
@@ -158,31 +226,12 @@ fmt_block_vspace(struct termp *p, const struct man_nod
 }
 
 
+/* ARGSUSED */
 static int
-arg_width(const struct man_node *n)
+pre_ign(DECL_ARGS)
 {
-	int		 i, len;
-	const char	*p;
 
-	assert(MAN_TEXT == n->type);
-	assert(n->string);
-
-	p = n->string;
-
-	if (0 == (len = (int)strlen(p)))
-		return(-1);
-
-	for (i = 0; i < len; i++) 
-		if ( ! isdigit((u_char)p[i]))
-			break;
-
-	if (i == len - 1)  {
-		if ('n' == p[len - 1] || 'm' == p[len - 1])
-			return(atoi(p));
-	} else if (i == len)
-		return(atoi(p));
-
-	return(-1);
+	return(0);
 }
 
 
@@ -191,7 +240,7 @@ static int
 pre_I(DECL_ARGS)
 {
 
-	p->flags |= TERMP_UNDER;
+	p->under++;
 	return(1);
 }
 
@@ -201,8 +250,7 @@ static int
 pre_r(DECL_ARGS)
 {
 
-	p->flags &= ~TERMP_UNDER;
-	p->flags &= ~TERMP_BOLD;
+	p->bold = p->under = 0;
 	return(1);
 }
 
@@ -213,7 +261,7 @@ post_i(DECL_ARGS)
 {
 
 	if (n->nchild)
-		p->flags &= ~TERMP_UNDER;
+		p->under--;
 }
 
 
@@ -222,7 +270,7 @@ static void
 post_I(DECL_ARGS)
 {
 
-	p->flags &= ~TERMP_UNDER;
+	p->under--;
 }
 
 
@@ -256,12 +304,12 @@ pre_IR(DECL_ARGS)
 
 	for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
 		if ( ! (i % 2))
-			p->flags |= TERMP_UNDER;
+			p->under++;
 		if (i > 0)
 			p->flags |= TERMP_NOSPACE;
 		print_node(p, mt, nn, m);
 		if ( ! (i % 2))
-			p->flags &= ~TERMP_UNDER;
+			p->under--;
 	}
 	return(0);
 }
@@ -269,37 +317,26 @@ pre_IR(DECL_ARGS)
 
 /* ARGSUSED */
 static int
-pre_IB(DECL_ARGS)
-{
-	const struct man_node *nn;
-	int		 i;
-
-	for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
-		p->flags |= i % 2 ? TERMP_BOLD : TERMP_UNDER;
-		if (i > 0)
-			p->flags |= TERMP_NOSPACE;
-		print_node(p, mt, nn, m);
-		p->flags &= i % 2 ? ~TERMP_BOLD : ~TERMP_UNDER;
-	}
-	return(0);
-}
-
-
-/* ARGSUSED */
-static int
 pre_RB(DECL_ARGS)
 {
 	const struct man_node *nn;
 	int		 i;
 
 	for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
-		if (i % 2)
-			p->flags |= TERMP_BOLD;
+		if (i % 2 && MAN_RB == n->tok)
+			p->bold++;
+		else if ( ! (i % 2) && MAN_RB != n->tok)
+			p->bold++;
+
 		if (i > 0)
 			p->flags |= TERMP_NOSPACE;
+
 		print_node(p, mt, nn, m);
-		if (i % 2)
-			p->flags &= ~TERMP_BOLD;
+
+		if (i % 2 && MAN_RB == n->tok)
+			p->bold--;
+		else if ( ! (i % 2) && MAN_RB != n->tok)
+			p->bold--;
 	}
 	return(0);
 }
@@ -314,12 +351,12 @@ pre_RI(DECL_ARGS)
 
 	for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
 		if ( ! (i % 2))
-			p->flags |= TERMP_UNDER;
+			p->under++;
 		if (i > 0)
 			p->flags |= TERMP_NOSPACE;
 		print_node(p, mt, nn, m);
 		if ( ! (i % 2))
-			p->flags &= ~TERMP_UNDER;
+			p->under--;
 	}
 	return(0);
 }
@@ -327,37 +364,33 @@ pre_RI(DECL_ARGS)
 
 /* ARGSUSED */
 static int
-pre_BR(DECL_ARGS)
-{
-	const struct man_node *nn;
-	int		 i;
-
-	for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
-		if ( ! (i % 2))
-			p->flags |= TERMP_BOLD;
-		if (i > 0)
-			p->flags |= TERMP_NOSPACE;
-		print_node(p, mt, nn, m);
-		if ( ! (i % 2))
-			p->flags &= ~TERMP_BOLD;
-	}
-	return(0);
-}
-
-
-/* ARGSUSED */
-static int
 pre_BI(DECL_ARGS)
 {
-	const struct man_node *nn;
-	int		 i;
+	const struct man_node	*nn;
+	int			 i;
 
 	for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
-		p->flags |= i % 2 ? TERMP_UNDER : TERMP_BOLD;
-		if (i > 0)
+		if (i % 2 && MAN_BI == n->tok)
+			p->under++;
+		else if (i % 2)
+			p->bold++;
+		else if (MAN_BI == n->tok)
+			p->bold++;
+		else
+			p->under++;
+
+		if (i)
 			p->flags |= TERMP_NOSPACE;
 		print_node(p, mt, nn, m);
-		p->flags &= i % 2 ? ~TERMP_UNDER : ~TERMP_BOLD;
+
+		if (i % 2 && MAN_BI == n->tok)
+			p->under--;
+		else if (i % 2)
+			p->bold--;
+		else if (MAN_BI == n->tok)
+			p->bold--;
+		else
+			p->under--;
 	}
 	return(0);
 }
@@ -368,7 +401,7 @@ static int
 pre_B(DECL_ARGS)
 {
 
-	p->flags |= TERMP_BOLD;
+	p->bold++;
 	return(1);
 }
 
@@ -378,7 +411,7 @@ static void
 post_B(DECL_ARGS)
 {
 
-	p->flags &= ~TERMP_BOLD;
+	p->bold--;
 }
 
 
@@ -388,12 +421,8 @@ pre_sp(DECL_ARGS)
 {
 	int		 i, len;
 
-	if (NULL == n->child) {
-		term_vspace(p);
-		return(0);
-	}
+	len = n->child ? arg2height(n->child) : 1;
 
-	len = atoi(n->child->string);
 	if (0 == len)
 		term_newln(p);
 	for (i = 0; i < len; i++)
@@ -423,7 +452,7 @@ pre_HP(DECL_ARGS)
 
 	switch (n->type) {
 	case (MAN_BLOCK):
-		fmt_block_vspace(p, n);
+		print_bvspace(p, n);
 		return(1);
 	case (MAN_BODY):
 		p->flags |= TERMP_NOBREAK;
@@ -433,23 +462,23 @@ pre_HP(DECL_ARGS)
 		return(0);
 	}
 
-	len = (size_t)mt->lmargin;
+	len = mt->lmargin;
 	ival = -1;
 
 	/* Calculate offset. */
 
 	if (NULL != (nn = n->parent->head->child))
-		if ((ival = arg_width(nn)) >= 0)
+		if ((ival = arg2width(nn)) >= 0)
 			len = (size_t)ival;
 
 	if (0 == len)
 		len = 1;
 
-	p->offset = INDENT;
-	p->rmargin = INDENT + len;
+	p->offset = mt->offset;
+	p->rmargin = mt->offset + len;
 
 	if (ival >= 0)
-		mt->lmargin = ival;
+		mt->lmargin = (size_t)ival;
 
 	return(1);
 }
@@ -468,7 +497,7 @@ post_HP(DECL_ARGS)
 		term_flushln(p);
 		p->flags &= ~TERMP_NOBREAK;
 		p->flags &= ~TERMP_TWOSPACE;
-		p->offset = INDENT;
+		p->offset = mt->offset;
 		p->rmargin = p->maxrmargin;
 		break;
 	default:
@@ -485,10 +514,10 @@ pre_PP(DECL_ARGS)
 	switch (n->type) {
 	case (MAN_BLOCK):
 		mt->lmargin = INDENT;
-		fmt_block_vspace(p, n);
+		print_bvspace(p, n);
 		break;
 	default:
-		p->offset = INDENT;
+		p->offset = mt->offset;
 		break;
 	}
 
@@ -514,13 +543,13 @@ pre_IP(DECL_ARGS)
 		p->flags |= TERMP_TWOSPACE;
 		break;
 	case (MAN_BLOCK):
-		fmt_block_vspace(p, n);
+		print_bvspace(p, n);
 		/* FALLTHROUGH */
 	default:
 		return(1);
 	}
 
-	len = (size_t)mt->lmargin;
+	len = mt->lmargin;
 	ival = -1;
 
 	/* Calculate offset. */
@@ -529,7 +558,7 @@ pre_IP(DECL_ARGS)
 		if (NULL != (nn = nn->next)) {
 			for ( ; nn->next; nn = nn->next)
 				/* Do nothing. */ ;
-			if ((ival = arg_width(nn)) >= 0)
+			if ((ival = arg2width(nn)) >= 0)
 				len = (size_t)ival;
 		}
 
@@ -539,20 +568,20 @@ pre_IP(DECL_ARGS)
 		if (0 == len)
 			len = 1;
 
-		p->offset = INDENT;
-		p->rmargin = INDENT + len;
+		p->offset = mt->offset;
+		p->rmargin = mt->offset + len;
 		if (ival < 0)
 			break;
 
 		/* Set the saved left-margin. */
-		mt->lmargin = ival;
+		mt->lmargin = (size_t)ival;
 
 		/* Don't print the length value. */
 		for (nn = n->child; nn->next; nn = nn->next)
 			print_node(p, mt, nn, m);
 		return(0);
 	case (MAN_BODY):
-		p->offset = INDENT + len;
+		p->offset = mt->offset + len;
 		p->rmargin = p->maxrmargin;
 		break;
 	default:
@@ -603,7 +632,7 @@ pre_TP(DECL_ARGS)
 		p->flags |= TERMP_NOSPACE;
 		break;
 	case (MAN_BLOCK):
-		fmt_block_vspace(p, n);
+		print_bvspace(p, n);
 		/* FALLTHROUGH */
 	default:
 		return(1);
@@ -616,7 +645,7 @@ pre_TP(DECL_ARGS)
 
 	if (NULL != (nn = n->parent->head->child))
 		if (NULL != nn->next)
-			if ((ival = arg_width(nn)) >= 0)
+			if ((ival = arg2width(nn)) >= 0)
 				len = (size_t)ival;
 
 	switch (n->type) {
@@ -625,8 +654,8 @@ pre_TP(DECL_ARGS)
 		if (0 == len)
 			len = 1;
 
-		p->offset = INDENT;
-		p->rmargin = INDENT + len;
+		p->offset = mt->offset;
+		p->rmargin = mt->offset + len;
 
 		/* Don't print same-line elements. */
 		for (nn = n->child; nn; nn = nn->next) 
@@ -634,11 +663,11 @@ pre_TP(DECL_ARGS)
 				print_node(p, mt, nn, m);
 
 		if (ival >= 0)
-			mt->lmargin = ival;
+			mt->lmargin = (size_t)ival;
 
 		return(0);
 	case (MAN_BODY):
-		p->offset = INDENT + len;
+		p->offset = mt->offset + len;
 		p->rmargin = p->maxrmargin;
 		break;
 	default:
@@ -679,6 +708,7 @@ pre_SS(DECL_ARGS)
 	switch (n->type) {
 	case (MAN_BLOCK):
 		mt->lmargin = INDENT;
+		mt->offset = INDENT;
 		/* If following a prior empty `SS', no vspace. */
 		if (n->prev && MAN_SS == n->prev->tok)
 			if (NULL == n->prev->body->child)
@@ -688,11 +718,11 @@ pre_SS(DECL_ARGS)
 		term_vspace(p);
 		break;
 	case (MAN_HEAD):
-		p->flags |= TERMP_BOLD;
+		p->bold++;
 		p->offset = HALFINDENT;
 		break;
 	case (MAN_BODY):
-		p->offset = INDENT;
+		p->offset = mt->offset;
 		break;
 	default:
 		break;
@@ -710,7 +740,7 @@ post_SS(DECL_ARGS)
 	switch (n->type) {
 	case (MAN_HEAD):
 		term_newln(p);
-		p->flags &= ~TERMP_BOLD;
+		p->bold--;
 		break;
 	case (MAN_BODY):
 		term_newln(p);
@@ -729,6 +759,7 @@ pre_SH(DECL_ARGS)
 	switch (n->type) {
 	case (MAN_BLOCK):
 		mt->lmargin = INDENT;
+		mt->offset = INDENT;
 		/* If following a prior empty `SH', no vspace. */
 		if (n->prev && MAN_SH == n->prev->tok)
 			if (NULL == n->prev->body->child)
@@ -736,11 +767,11 @@ pre_SH(DECL_ARGS)
 		term_vspace(p);
 		break;
 	case (MAN_HEAD):
-		p->flags |= TERMP_BOLD;
+		p->bold++;
 		p->offset = 0;
 		break;
 	case (MAN_BODY):
-		p->offset = INDENT;
+		p->offset = mt->offset;
 		break;
 	default:
 		break;
@@ -758,7 +789,7 @@ post_SH(DECL_ARGS)
 	switch (n->type) {
 	case (MAN_HEAD):
 		term_newln(p);
-		p->flags &= ~TERMP_BOLD;
+		p->bold--;
 		break;
 	case (MAN_BODY):
 		term_newln(p);
@@ -769,7 +800,57 @@ post_SH(DECL_ARGS)
 }
 
 
+/* ARGSUSED */
+static int
+pre_RS(DECL_ARGS)
+{
+	const struct man_node	*nn;
+	int			 ival;
+
+	switch (n->type) {
+	case (MAN_BLOCK):
+		term_newln(p);
+		return(1);
+	case (MAN_HEAD):
+		return(0);
+	default:
+		break;
+	}
+
+	if (NULL == (nn = n->parent->head->child)) {
+		mt->offset = mt->lmargin + INDENT;
+		p->offset = mt->offset;
+		return(1);
+	}
+
+	if ((ival = arg2width(nn)) < 0)
+		return(1);
+
+	mt->offset = INDENT + (size_t)ival;
+	p->offset = mt->offset;
+
+	return(1);
+}
+
+
+/* ARGSUSED */
 static void
+post_RS(DECL_ARGS)
+{
+
+	switch (n->type) {
+	case (MAN_BLOCK):
+		mt->offset = mt->lmargin = INDENT;
+		break;
+	default:
+		term_newln(p);
+		p->offset = INDENT;
+		break;
+	}
+}
+
+
+static void
 print_node(DECL_ARGS)
 {
 	int		 c, sz;
@@ -829,15 +910,12 @@ static void
 print_foot(struct termp *p, const struct man_meta *meta)
 {
 	struct tm	*tm;
-	char		*buf;
+	char		 buf[BUFSIZ];
 
-	if (NULL == (buf = malloc(p->rmargin)))
-		err(1, "malloc");
-
 	tm = localtime(&meta->date);
 
 	if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))
-		err(1, "strftime");
+		(void)strlcpy(buf, "(invalid date)", BUFSIZ);
 
 	term_vspace(p);
 
@@ -858,8 +936,6 @@ print_foot(struct termp *p, const struct man_meta *met
 
 	term_word(p, buf);
 	term_flushln(p);
-
-	free(buf);
 }
 
 
@@ -872,9 +948,9 @@ print_head(struct termp *p, const struct man_meta *met
 	p->offset = 0;
 
 	if (NULL == (buf = malloc(p->rmargin)))
-		err(1, "malloc");
+		err(EXIT_FAILURE, "malloc");
 	if (NULL == (title = malloc(p->rmargin)))
-		err(1, "malloc");
+		err(EXIT_FAILURE, "malloc");
 
 	if (meta->vol)
 		(void)strlcpy(buf, meta->vol, p->rmargin);