Fix a regression caused by mdoc_term.c 1.214 / mdoc_html.c 1.148:

[mandoc.git] / term_ps.c

diff --git a/term_ps.c b/term_ps.c
index 3fc23d21d5bef7093c6634a54ba29edcf28b671b..543b111c2ba66017436efca3737656016c615541 100644 (file)
--- a/term_ps.c
+++ b/term_ps.c
@@ -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.46 2011/01/25 17:32:04 kristaps Exp $ */
 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -18,7 +18,7 @@
 #include "config.h"
 #endif
 
-#include <sys/param.h>
+#include <sys/types.h>
 
 #include <assert.h>
 #include <stdarg.h>
@@ -29,6 +29,7 @@
 #include <time.h>
 #include <unistd.h>
 
+#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);
                }
        }
 
@@ -902,7 +907,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;