=================================================================== RCS file: /cvs/mandoc/term_ps.c,v retrieving revision 1.40 retrieving revision 1.45 diff -u -p -r1.40 -r1.45 --- mandoc/term_ps.c 2010/08/01 15:46:18 1.40 +++ mandoc/term_ps.c 2010/09/27 23:03:44 1.45 @@ -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.45 2010/09/27 23:03:44 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 *, @@ -578,6 +583,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 +610,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); } } @@ -902,7 +908,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;