=================================================================== RCS file: /cvs/mandoc/man_term.c,v retrieving revision 1.103 retrieving revision 1.107 diff -u -p -r1.103 -r1.107 --- mandoc/man_term.c 2011/02/09 09:52:47 1.103 +++ mandoc/man_term.c 2011/04/30 22:14:02 1.107 @@ -1,4 +1,4 @@ -/* $Id: man_term.c,v 1.103 2011/02/09 09:52:47 kristaps Exp $ */ +/* $Id: man_term.c,v 1.107 2011/04/30 22:14:02 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010, 2011 Ingo Schwarze @@ -31,7 +31,6 @@ #include "out.h" #include "man.h" #include "term.h" -#include "chars.h" #include "main.h" #define INDENT 7 @@ -159,7 +158,7 @@ terminal_man(void *arg, const struct man *man) if (NULL == p->symtab) switch (p->enc) { case (TERMENC_ASCII): - p->symtab = chars_init(CHARS_ASCII); + p->symtab = mchars_init(); break; default: abort(); @@ -946,24 +945,18 @@ print_man_nodelist(DECL_ARGS) static void print_man_foot(struct termp *p, const void *arg) { - char buf[DATESIZ]; const struct man_meta *meta; meta = (const struct man_meta *)arg; term_fontrepl(p, TERMFONT_NONE); - if (meta->rawdate) - strlcpy(buf, meta->rawdate, DATESIZ); - else - time2a(meta->date, buf, DATESIZ); - term_vspace(p); term_vspace(p); term_vspace(p); p->flags |= TERMP_NOSPACE | TERMP_NOBREAK; - p->rmargin = p->maxrmargin - term_strlen(p, buf); + p->rmargin = p->maxrmargin - term_strlen(p, meta->date); p->offset = 0; /* term_strlen() can return zero. */ @@ -981,7 +974,7 @@ print_man_foot(struct termp *p, const void *arg) p->rmargin = p->maxrmargin; p->flags &= ~TERMP_NOBREAK; - term_word(p, buf); + term_word(p, meta->date); term_flushln(p); }