--- ray/src/util/rad.c	2015/05/27 13:29:57	2.114
+++ ray/src/util/rad.c	2016/03/06 01:13:18	2.124
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rad.c,v 2.114 2015/05/27 13:29:57 greg Exp $";
+static const char	RCSid[] = "$Id: rad.c,v 2.124 2016/03/06 01:13:18 schorsch Exp $";
 #endif
 /*
  * Executive program for oconv, rpict and pfilt
@@ -9,6 +9,7 @@ static const char	RCSid[] = "$Id: rad.c,v 2.114 2015/0
 
 #include <ctype.h>
 #include <time.h>
+#include <signal.h>
 
 #include "platform.h"
 #include "rtprocess.h"
@@ -16,7 +17,7 @@ static const char	RCSid[] = "$Id: rad.c,v 2.114 2015/0
 #include "paths.h"
 #include "vars.h"
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(_WIN64)
   #define DELCMD "del"
   #define RENAMECMD "rename"
 #else
@@ -644,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;
@@ -672,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);
 		}
@@ -803,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);
@@ -814,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));
@@ -829,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));
+		}
 	}
 }
 
@@ -1068,7 +1074,7 @@ hiqopts(				/* high quality rendering options */
 }
 
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(_WIN64)
 static void
 setenv(			/* set an environment variable */
 	char	*vname,
@@ -1115,7 +1121,7 @@ xferopts(				/* transfer options if indicated */
 			syserr(vval(OPTFILE));
 		sprintf(ro, " @%s", vval(OPTFILE));
 	}
-#ifdef _WIN32
+#if defined(_WIN32) || defined(_WIN64)
 	else if (n > 50) {
 		setenv("ROPT", ro+1);
 		strcpy(ro, " $ROPT");
@@ -1142,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));
+	}
 }
 
 
@@ -1292,7 +1299,7 @@ specview(				/* get proper view spec from vs */
 	if (cp == viewopts)		/* append any additional options */
 		vs++;		/* skip prefixed space if unneeded */
 	strcpy(cp, vs);
-#ifdef _WIN32
+#if defined(_WIN32) || defined(_WIN64)
 	if (strlen(viewopts) > 40) {
 		setenv("VIEW", viewopts);
 		return("$VIEW");
@@ -1338,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))
@@ -1346,7 +1353,7 @@ numview:
 			*vn = '\0';
 		} else
 			sprintf(vn, "%d", n+1);
-
+	}
 	return(specview(mv));
 }
 
@@ -1360,14 +1367,14 @@ myprintview(			/* print out selected view */
 	VIEW	vwr;
 	char	buf[128];
 	char	*cp;
-#ifdef _WIN32
+#if defined(_WIN32) || defined(_WIN64)
 /* XXX Should we allow something like this for all platforms? */
 /* XXX Or is it still required at all? */
 again:
 #endif
 	if (vopts == NULL)
 		return(-1);
-#ifdef _WIN32
+#if defined(_WIN32) || defined(_WIN64)
 	if (vopts[0] == '$') {
 		vopts = getenv(vopts+1);
 		goto again;
@@ -1514,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;
 		}
 	}