===================================================================
RCS file: /cvs/mandoc/term_ps.c,v
retrieving revision 1.39
retrieving revision 1.49
diff -u -p -r1.39 -r1.49
--- mandoc/term_ps.c	2010/07/25 22:15:07	1.39
+++ mandoc/term_ps.c	2011/05/14 17:54:42	1.49
@@ -1,4 +1,4 @@
-/*	$Id: term_ps.c,v 1.39 2010/07/25 22:15:07 kristaps Exp $ */
+/*	$Id: term_ps.c,v 1.49 2011/05/14 17:54:42 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"
@@ -353,31 +354,33 @@ static	const struct font fonts[TERMFONT__MAX] = {
 
 /* These work the buffer used by the header and footer. */
 #define	PS_BUFSLOP	  128
-#define	PS_GROWBUF(p, sz) \
-	do if ((p)->engine.ps.psmargcur + (sz) > \
-			(p)->engine.ps.psmargsz) { \
-		(p)->engine.ps.psmargsz += /* CONSTCOND */ \
-			MAX(PS_BUFSLOP, (sz)); \
-		(p)->engine.ps.psmarg = realloc \
-			((p)->engine.ps.psmarg,  \
-			 (p)->engine.ps.psmargsz); \
-		if (NULL == (p)->engine.ps.psmarg) { \
-			perror(NULL); \
-			exit(EXIT_FAILURE); \
-		} \
-	} while (/* CONSTCOND */ 0)
 
+static void
+ps_growbuf(struct termp *p, size_t sz)
+{
+	if (p->engine.ps.psmargcur + sz <= p->engine.ps.psmargsz)
+		return;
 
+	if (sz < PS_BUFSLOP)
+		sz = PS_BUFSLOP;
+
+	p->engine.ps.psmargsz += sz;
+
+	p->engine.ps.psmarg = mandoc_realloc
+		(p->engine.ps.psmarg,
+		 p->engine.ps.psmargsz);
+}
+
 static	double		  ps_hspan(const struct termp *,
 				const struct roffsu *);
-static	size_t		  ps_width(const struct termp *, char);
+static	size_t		  ps_width(const struct termp *, int);
 static	void		  ps_advance(struct termp *, size_t);
 static	void		  ps_begin(struct termp *);
 static	void		  ps_closepage(struct termp *);
 static	void		  ps_end(struct termp *);
 static	void		  ps_endline(struct termp *);
 static	void		  ps_fclose(struct termp *);
-static	void		  ps_letter(struct termp *, char);
+static	void		  ps_letter(struct termp *, int);
 static	void		  ps_pclose(struct termp *);
 static	void		  ps_pletter(struct termp *, int);
 static	void		  ps_printf(struct termp *, const char *, ...);
@@ -420,8 +423,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;
@@ -556,7 +558,7 @@ ps_printf(struct termp *p, const char *fmt, ...)
 	 * assumption that will cause pukeage if it's not the case.
 	 */
 
-	PS_GROWBUF(p, PS_BUFSLOP);
+	ps_growbuf(p, PS_BUFSLOP);
 
 	pos = (int)p->engine.ps.psmargcur;
 	len = vsnprintf(&p->engine.ps.psmarg[pos], PS_BUFSLOP, fmt, ap);
@@ -575,12 +577,13 @@ 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;
 	}
 
-	PS_GROWBUF(p, 2);
+	ps_growbuf(p, 2);
 
 	pos = (int)p->engine.ps.psmargcur++;
 	p->engine.ps.psmarg[pos++] = c;
@@ -601,7 +604,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);
 		}
 	}
 
@@ -780,7 +783,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");
@@ -800,7 +802,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");
 
@@ -899,7 +900,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;
@@ -962,10 +963,13 @@ ps_fclose(struct termp *p)
 
 
 static void
-ps_letter(struct termp *p, char c)
+ps_letter(struct termp *p, int arg)
 {
-	char		cc;
+	char		cc, c;
 
+	/* LINTED */
+	c = arg >= 128 || arg <= 0 ? '?' : arg;
+
 	/*
 	 * State machine dictates whether to buffer the last character
 	 * or not.  Basically, encoded words are detected by checking if
@@ -1094,14 +1098,14 @@ ps_setfont(struct termp *p, enum termfont f)
 
 /* ARGSUSED */
 static size_t
-ps_width(const struct termp *p, char c)
+ps_width(const struct termp *p, int c)
 {
 
 	if (c <= 32 || c - 32 >= MAXCHAR)
 		return((size_t)fonts[(int)TERMFONT_NONE].gly[0].wx);
 
 	c -= 32;
-	return((size_t)fonts[(int)TERMFONT_NONE].gly[(int)c].wx);
+	return((size_t)fonts[(int)TERMFONT_NONE].gly[c].wx);
 }