--- ray/src/rt/rpict.c	2003/06/26 00:58:10	2.56
+++ ray/src/rt/rpict.c	2003/07/21 22:30:19	2.61
@@ -7,11 +7,12 @@ static const char RCSid[] = "$Id";
 
 #include "copyright.h"
 
+#include  "platform.h"
 #include  "ray.h"
 
 #include  <sys/types.h>
 
-#ifndef NIX
+#ifndef NON_POSIX
 #ifdef BSD
 #include  <sys/time.h>
 #include  <sys/resource.h>
@@ -24,7 +25,6 @@ static const char RCSid[] = "$Id";
 #include  <time.h>
 #include  <signal.h>
 
-#include  "platform.h"
 #include  "view.h"
 #include  "random.h"
 #include  "paths.h"
@@ -115,9 +115,7 @@ void  report();
 
 double	pixvalue();
 
-#ifdef NIX
-#define  file_exists(f)	(access(f,F_OK)==0)
-#else
+#ifdef RHAS_STAT
 #include  <sys/types.h>
 #include  <sys/stat.h>
 int
@@ -128,6 +126,8 @@ char  *fname;
 	if (stat(fname, &sbuf) < 0) return(0);
 	return((sbuf.st_mode & S_IFREG) != 0);
 }
+#else
+#define  file_exists(f)	(access(f,F_OK)==0)
 #endif
 
 
@@ -137,7 +137,7 @@ int  code;
 {
 	if (code)			/* report status */
 		report();
-#ifndef NIX
+#ifndef NON_POSIX
 	headclean();			/* delete header file */
 	pfclean();			/* clean up persist files */
 #endif
@@ -145,7 +145,7 @@ int  code;
 }
 
 
-#ifndef NIX
+#ifndef NON_POSIX
 void
 report()		/* report progress */
 {
@@ -253,7 +253,7 @@ char  *pout, *zout, *prvr;
 				cp--;
 			strcpy(cp, RFTEMPLATE);
 			prvr = mktemp(fbuf2);
-			if (rename(fbuf, prvr) < 0)
+			if (rename(fbuf, prvr) < 0) {
 				if (errno == ENOENT) {	/* ghost file */
 					sprintf(errmsg,
 						"new output file \"%s\"",
@@ -266,6 +266,7 @@ char  *pout, *zout, *prvr;
 						fbuf, prvr);
 					error(SYSTEM, errmsg);
 				}
+			}
 		}
 	}
 	npicts = 0;			/* render sequence */
@@ -294,7 +295,7 @@ char  *pout, *zout, *prvr;
 			dupheader();
 		}
 		hres = hresolu; vres = vresolu; pa = pixaspect;
-		if (prvr != NULL)
+		if (prvr != NULL) {
 			if (viewfile(prvr, &ourview, &rs) <= 0
 					|| rs.rt != PIXSTANDARD) {
 				sprintf(errmsg,
@@ -305,6 +306,7 @@ char  *pout, *zout, *prvr;
 				hres = scanlen(&rs);
 				vres = numscans(&rs);
 			}
+		}
 		if ((cp = setview(&ourview)) != NULL)
 			error(USER, cp);
 		normaspect(viewaspect(&ourview), &pa, &hres, &vres);
@@ -322,6 +324,7 @@ char  *pout, *zout, *prvr;
 		putchar('\n');
 		if (pa < .99 || pa > 1.01)
 			fputaspect(pa, stdout);
+		fputnow(stdout);
 		fputformat(COLRFMT, stdout);
 		putchar('\n');
 		if (zout != NULL)
@@ -343,7 +346,7 @@ FILE  *fp;
 {
 	char  linebuf[256];
 
-	copystruct(&lastview, &ourview);
+	lastview = ourview;
 	while (fgets(linebuf, sizeof(linebuf), fp) != NULL)
 		if (isview(linebuf) && sscanview(&ourview, linebuf) > 0)
 			return(0);