diff options
| -rw-r--r-- | man_term.c | 23 | ||||
| -rw-r--r-- | mdoc_term.c | 31 |
2 files changed, 14 insertions, 40 deletions
@@ -939,25 +939,18 @@ print_man_foot(struct termp *p, const struct man_meta *meta) static void -print_man_head(struct termp *p, const struct man_meta *meta) +print_man_head(struct termp *p, const struct man_meta *m) { - char *buf, *title; + char buf[BUFSIZ], title[BUFSIZ]; p->rmargin = p->maxrmargin; p->offset = 0; + buf[0] = title[0] = '\0'; - if (NULL == (buf = malloc(p->rmargin))) - err(EXIT_FAILURE, "malloc"); - if (NULL == (title = malloc(p->rmargin))) - err(EXIT_FAILURE, "malloc"); + if (m->vol) + strlcpy(buf, m->vol, BUFSIZ); - if (meta->vol) - (void)strlcpy(buf, meta->vol, p->rmargin); - else - *buf = 0; - - (void)snprintf(title, p->rmargin, "%s(%d)", - meta->title, meta->msec); + snprintf(title, BUFSIZ, "%s(%d)", m->title, m->msec); p->offset = 0; p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2; @@ -984,8 +977,4 @@ print_man_head(struct termp *p, const struct man_meta *meta) p->rmargin = p->maxrmargin; p->offset = 0; p->flags &= ~TERMP_NOSPACE; - - free(title); - free(buf); } - diff --git a/mdoc_term.c b/mdoc_term.c index f503bd4c..c3daf7a3 100644 --- a/mdoc_term.c +++ b/mdoc_term.c @@ -348,8 +348,7 @@ print_node(DECL_ARGS) static void print_foot(DECL_ARGS) { - char buf[DATESIZ]; - char *os; + char buf[DATESIZ], os[BUFSIZ]; /* * Output the footer in new-groff style, that is, three columns @@ -359,12 +358,8 @@ print_foot(DECL_ARGS) * SYSTEM DATE SYSTEM */ - if (NULL == (os = malloc(p->rmargin))) - err(EXIT_FAILURE, "malloc"); - time2a(m->date, buf, DATESIZ); - - (void)strlcpy(os, m->os, p->rmargin); + strlcpy(os, m->os, BUFSIZ); term_vspace(p); @@ -393,8 +388,6 @@ print_foot(DECL_ARGS) p->offset = 0; p->rmargin = p->maxrmargin; p->flags = 0; - - free(os); } @@ -403,16 +396,11 @@ print_foot(DECL_ARGS) static void print_head(DECL_ARGS) { - char *buf, *title; + char buf[BUFSIZ], title[BUFSIZ]; p->rmargin = p->maxrmargin; p->offset = 0; - if (NULL == (buf = malloc(p->rmargin))) - err(EXIT_FAILURE, "malloc"); - if (NULL == (title = malloc(p->rmargin))) - err(EXIT_FAILURE, "malloc"); - /* * The header is strange. It has three components, which are * really two with the first duplicated. It goes like this: @@ -427,15 +415,15 @@ print_head(DECL_ARGS) */ assert(m->vol); - (void)strlcpy(buf, m->vol, p->rmargin); + strlcpy(buf, m->vol, BUFSIZ); if (m->arch) { - (void)strlcat(buf, " (", p->rmargin); - (void)strlcat(buf, m->arch, p->rmargin); - (void)strlcat(buf, ")", p->rmargin); + strlcat(buf, " (", BUFSIZ); + strlcat(buf, m->arch, BUFSIZ); + strlcat(buf, ")", BUFSIZ); } - snprintf(title, p->rmargin, "%s(%d)", m->title, m->msec); + snprintf(title, BUFSIZ, "%s(%d)", m->title, m->msec); p->offset = 0; p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2; @@ -462,9 +450,6 @@ print_head(DECL_ARGS) p->offset = 0; p->rmargin = p->maxrmargin; p->flags &= ~TERMP_NOSPACE; - - free(title); - free(buf); } |