--- ray/src/util/rad.c	2015/05/27 12:50:46	2.113
+++ ray/src/util/rad.c	2015/10/28 02:52:17	2.123
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rad.c,v 2.113 2015/05/27 12:50:46 greg Exp $";
+static const char	RCSid[] = "$Id: rad.c,v 2.123 2015/10/28 02:52:17 greg Exp $";
 #endif
 /*
  * Executive program for oconv, rpict and pfilt
@@ -9,6 +9,7 @@ static const char	RCSid[] = "$Id: rad.c,v 2.113 2015/0
 
 #include <ctype.h>
 #include <time.h>
+#include <signal.h>
 
 #include "platform.h"
 #include "rtprocess.h"
@@ -401,9 +402,6 @@ checkfiles(void)			/* check for existence and modified
 		atos(fntemp, sizeof(fntemp), vval(PCMAP));
 		pcmapname = savqstr(fntemp);
 		pcmapdate = fdate(pcmapname);
-		if (pgmapname == NULL && !nowarn)
-			fprintf(stderr, "%s: warning - '%s' assigned without '%s'\n",
-					progname, vnam(PCMAP), vnam(PGMAP));
 	}
 	matdate = checklast(vval(MATERIAL));
 }	
@@ -647,6 +645,8 @@ mkpmap(void)			/* run mkpmap if indicated */
 		for (cp = combuf; *cp; cp++)
 			;
 		mkpmapopts(cp);
+				/* force file overwrite */
+		cp = addarg(cp, "-fo+");
 		if (vdef(REPORT)) {
 			char	errfile[256];
 			int	n;
@@ -675,9 +675,9 @@ mkpmap(void)			/* run mkpmap if indicated */
 		if (runcom(combuf)) {
 			fprintf(stderr, "%s: error running %s\n",
 					progname, c_mkpmap);
-			if (pgmapname != NULL)
+			if (pgmapname != NULL && pgmapdate < oct1date)
 				unlink(pgmapname);
-			if (pcmapname != NULL)
+			if (pcmapname != NULL && pcmapdate < oct1date)
 				unlink(pcmapname);
 			quit(1);
 		}
@@ -806,6 +806,13 @@ renderopts(			/* set rendering options */
 {
 	char	pmapf[256], *bw;
 
+	if (vdef(PGMAP)) {
+		*op = '\0';
+		bw = sskip2(vval(PGMAP), 2);
+		atos(pmapf, sizeof(pmapf), vval(PGMAP));
+		op = addarg(addarg(op, "-ap"), pmapf);
+		if (atoi(bw) > 0) op = addarg(op, bw);
+	}
 	switch(vscale(QUALITY)) {
 	case LOW:
 		lowqopts(op, po);
@@ -817,12 +824,6 @@ renderopts(			/* set rendering options */
 		hiqopts(op, po);
 		break;
 	}
-	if (vdef(PGMAP)) {
-		bw = sskip2(vval(PGMAP), 2);
-		atos(pmapf, sizeof(pmapf), vval(PGMAP));
-		op = addarg(addarg(op, "-ap"), pmapf);
-		if (atoi(bw) > 0) op = addarg(op, bw);
-	}
 	if (vdef(PCMAP)) {
 		bw = sskip2(vval(PCMAP), 2);
 		atos(pmapf, sizeof(pmapf), vval(PCMAP));
@@ -832,19 +833,21 @@ renderopts(			/* set rendering options */
 	if (vdef(RENDER))
 		op = addarg(op, vval(RENDER));
 	if (rvdevice != NULL) {
-		if (vdef(RVU))
+		if (vdef(RVU)) {
 			if (vval(RVU)[0] != '-') {
 				atos(c_rvu, sizeof(c_rvu), vval(RVU));
 				po = addarg(po, sskip2(vval(RVU), 1));
 			} else
 				po = addarg(po, vval(RVU));
+		}
 	} else {
-		if (vdef(RPICT))
+		if (vdef(RPICT)) {
 			if (vval(RPICT)[0] != '-') {
 				atos(c_rpict, sizeof(c_rpict), vval(RPICT));
 				po = addarg(po, sskip2(vval(RPICT), 1));
 			} else
 				po = addarg(po, vval(RPICT));
+		}
 	}
 }
 
@@ -1145,12 +1148,13 @@ pfiltopts(				/* get pfilt options */
 		po = addarg(po, "-m .25");
 		break;
 	}
-	if (vdef(PFILT))
+	if (vdef(PFILT)) {
 		if (vval(PFILT)[0] != '-') {
 			atos(c_pfilt, sizeof(c_pfilt), vval(PFILT));
 			po = addarg(po, sskip2(vval(PFILT), 1));
 		} else
 			po = addarg(po, vval(PFILT));
+	}
 }
 
 
@@ -1341,7 +1345,7 @@ getview(				/* get view n, or NULL if none */
 	}
 numview:
 	mv = nvalue(VIEWS, n);		/* use view n */
-	if ((vn != NULL) & (mv != NULL))
+	if ((vn != NULL) & (mv != NULL)) {
 		if (*mv != '-') {
 			char	*mv2 = mv;
 			while (*mv2 && !isspace(*mv2))
@@ -1349,7 +1353,7 @@ numview:
 			*vn = '\0';
 		} else
 			sprintf(vn, "%d", n+1);
-
+	}
 	return(specview(mv));
 }
 
@@ -1517,6 +1521,7 @@ rpict(				/* run rpict and pfilt for each view */
 				fprintf(stderr, "%s: cannot create\n", pfile);
 				quit(1);
 			}
+			pfile[-5] = '\0';
 			pfile = NULL;
 		}
 	}