=================================================================== RCS file: /cvs/mandoc/term_ps.c,v retrieving revision 1.40 retrieving revision 1.47 diff -u -p -r1.40 -r1.47 --- mandoc/term_ps.c 2010/08/01 15:46:18 1.40 +++ mandoc/term_ps.c 2011/03/07 01:58:24 1.47 @@ -1,4 +1,4 @@ -/* $Id: term_ps.c,v 1.40 2010/08/01 15:46:18 joerg Exp $ */ +/* $Id: term_ps.c,v 1.47 2011/03/07 01:58:24 schwarze Exp $ */ /* * Copyright (c) 2010 Kristaps Dzonsons * @@ -18,7 +18,7 @@ #include "config.h" #endif -#include +#include #include #include @@ -29,6 +29,7 @@ #include #include +#include "mandoc.h" #include "out.h" #include "main.h" #include "term.h" @@ -362,13 +363,17 @@ ps_growbuf(struct termp *p, size_t sz) if (sz < PS_BUFSLOP) sz = PS_BUFSLOP; + p->engine.ps.psmargsz += sz; - p->engine.ps.psmarg = realloc(p->engine.ps.psmarg, - p->engine.ps.psmargsz); - if (NULL == p->engine.ps.psmarg) + p->engine.ps.psmarg = realloc + (p->engine.ps.psmarg, + p->engine.ps.psmargsz); + + if (NULL == p->engine.ps.psmarg) { perror(NULL); - exit(EXIT_FAILURE); + exit((int)MANDOCLEVEL_SYSERR); + } } static double ps_hspan(const struct termp *, @@ -423,8 +428,7 @@ pspdf_alloc(char *outopts) const char *pp; char *v; - if (NULL == (p = term_alloc(TERMENC_ASCII))) - return(NULL); + p = term_alloc(TERMENC_ASCII); p->advance = ps_advance; p->begin = ps_begin; @@ -578,6 +582,7 @@ ps_putchar(struct termp *p, char c) /* See ps_printf(). */ if ( ! (PS_MARGINS & p->engine.ps.flags)) { + /* LINTED */ putchar(c); p->engine.ps.pdfbytes++; return; @@ -604,7 +609,7 @@ pdf_obj(struct termp *p, size_t obj) p->engine.ps.pdfobjsz * sizeof(size_t)); if (NULL == p->engine.ps.pdfobjs) { perror(NULL); - exit(EXIT_FAILURE); + exit((int)MANDOCLEVEL_SYSERR); } } @@ -783,7 +788,6 @@ ps_begin(struct termp *p) if (TERMTYPE_PS == p->type) { ps_printf(p, "%%!PS-Adobe-3.0\n"); - ps_printf(p, "%%%%Creator: mandoc-%s\n", VERSION); ps_printf(p, "%%%%CreationDate: %s", ctime(&t)); ps_printf(p, "%%%%DocumentData: Clean7Bit\n"); ps_printf(p, "%%%%Orientation: Portrait\n"); @@ -803,7 +807,6 @@ ps_begin(struct termp *p) ps_printf(p, "%%PDF-1.1\n"); pdf_obj(p, 1); ps_printf(p, "<<\n"); - ps_printf(p, "/Creator mandoc-%s\n", VERSION); ps_printf(p, ">>\n"); ps_printf(p, "endobj\n"); @@ -902,7 +905,7 @@ ps_pletter(struct termp *p, int c) f = (int)p->engine.ps.lastf; - if (c <= 32 || (c - 32 > MAXCHAR)) { + if (c <= 32 || (c - 32 >= MAXCHAR)) { ps_putchar(p, ' '); p->engine.ps.pscol += (size_t)fonts[f].gly[0].wx; return;