--- ray/src/rt/rpict.c	1992/07/10 19:29:50	2.9
+++ ray/src/rt/rpict.c	1992/09/08 20:56:20	2.13
@@ -26,6 +26,8 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "random.h"
 
+#include  "paths.h"
+
 int  dimlist[MAXDIM];			/* sampling dimensions */
 int  ndims = 0;				/* number of sampling dimensions */
 int  samplendx;				/* sample index number */
@@ -78,7 +80,7 @@ extern long  nrays;			/* number of rays traced */
 #define  pixjitter()	(.5+dstrpix*(.5-frandom()))
 
 #define  RFTEMPLATE	"rfXXXXXX"
-#define  HFTEMPLATE	"/tmp/hfXXXXXX"
+#define  HFTEMPLATE	TEMPLATE
 
 static char  *hfname = NULL;		/* header file name */
 static FILE  *hfp = NULL;		/* header file pointer */
@@ -211,7 +213,7 @@ char  *pout, *zout, *prvr;
 	}
 	if (pout != NULL) {
 		sprintf(fbuf, pout, seq);
-		if (!strcmp(prvr, fbuf)) {	/* rename recover file */
+		if (prvr != NULL && !strcmp(prvr, fbuf)) {	/* rename */
 			fbuf2[0] = '\0';
 			if ((cp = rindex(fbuf, '/')) != NULL)
 				strncpy(fbuf2, fbuf, cp-fbuf+1);
@@ -255,8 +257,10 @@ char  *pout, *zout, *prvr;
 		normaspect(viewaspect(&ourview), &pa, &hres, &vres);
 		if (seq) {
 			if (ralrm > 0) {
-				sprintf(errmsg, "starting frame %d\n", seq);
-				eputs(errmsg);
+				fprintf(stderr, "FRAME %d:", seq);
+				fprintview(&ourview, stderr);
+				putc('\n', stderr);
+				fflush(stderr);
 			}
 			printf("FRAME=%d\n", seq);
 		}
@@ -411,6 +415,8 @@ char  *zfile, *oldfile;
 	if (sampdens != NULL)
 		free(sampdens);
 	pctdone = 100.0;
+	if (ralrm > 0)
+		report();
 	return;
 writerr:
 	error(SYSTEM, "write error in render");