--- ray/src/rt/rpict.c	1992/09/21 12:07:52	2.14
+++ ray/src/rt/rpict.c	1993/07/30 10:31:09	2.26
@@ -27,6 +27,12 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "paths.h"
 
+#define	 RFTEMPLATE	"rfXXXXXX"
+
+#ifndef SIGCONT
+#define SIGCONT		SIGIO
+#endif
+
 int  dimlist[MAXDIM];			/* sampling dimensions */
 int  ndims = 0;				/* number of sampling dimensions */
 int  samplendx;				/* sample index number */
@@ -45,7 +51,7 @@ double	shadthresh = .05;		/* shadow threshold */
 double	shadcert = .5;			/* shadow certainty */
 int  directrelay = 1;			/* number of source relays */
 int  vspretest = 512;			/* virtual source pretest density */
-int  directinvis = 0;			/* sources invisible? */
+int  directvis = 1;			/* sources visible? */
 double	srcsizerat = .25;		/* maximum ratio source size/dist. */
 
 double	specthresh = .15;		/* specular sampling threshold */
@@ -63,7 +69,11 @@ int  ambounce = 0;			/* ambient bounces */
 char  *amblist[128];			/* ambient include/exclude list */
 int  ambincl = -1;			/* include == 1, exclude == 0 */
 
+#ifdef MSDOS
+int  ralrm = 60;			/* seconds between reports */
+#else
 int  ralrm = 0;				/* seconds between reports */
+#endif
 
 double	pctdone = 0.0;			/* percentage done */
 
@@ -72,18 +82,12 @@ long  tlastrept = 0L;			/* time at last report */
 extern long  time();
 extern long  tstart;			/* starting time */
 
-extern long  nrays;			/* number of rays traced */
+extern unsigned long  nrays;		/* number of rays traced */
 
 #define	 MAXDIV		16		/* maximum sample size */
 
 #define	 pixjitter()	(.5+dstrpix*(.5-frandom()))
 
-#define	 RFTEMPLATE	"rfXXXXXX"
-#define	 HFTEMPLATE	TEMPLATE
-
-static char  *hfname = NULL;		/* header file name */
-static FILE  *hfp = NULL;		/* header file pointer */
-
 static int  hres, vres;			/* resolution for this frame */
 
 extern char  *mktemp();
@@ -96,11 +100,8 @@ int  code;
 {
 	if (code)			/* report status */
 		report();
-	if (hfname != NULL) {		/* delete header file */
-		if (hfp != NULL)
-			fclose(hfp);
-		unlink(hfname);
-	}
+	headclean();			/* delete header file */
+	pfclean();			/* clean up persist files */
 	exit(code);
 }
 
@@ -118,7 +119,7 @@ report()		/* report progress */
 	t += (rubuf.ru_utime.tv_usec + rubuf.ru_stime.tv_usec) / 1e6;
 	t += rubuf.ru_utime.tv_sec + rubuf.ru_stime.tv_sec;
 
-	sprintf(errmsg, "%ld rays, %4.2f%% done after %5.4f CPU hours\n",
+	sprintf(errmsg, "%lu rays, %4.2f%% done after %5.4f CPU hours\n",
 			nrays, pctdone, t/3600.0);
 	eputs(errmsg);
 	tlastrept = time((long *)0);
@@ -127,44 +128,14 @@ report()		/* report progress */
 report()		/* report progress */
 {
 	tlastrept = time((long *)0);
-	sprintf(errmsg, "%ld rays, %4.2f%% done after %5.4f hours\n",
+	sprintf(errmsg, "%lu rays, %4.2f%% done after %5.4f hours\n",
 			nrays, pctdone, (tlastrept-tstart)/3600.0);
 	eputs(errmsg);
-	signal(SIGALRM, report);
+	signal(SIGCONT, report);
 }
 #endif
 
 
-openheader()			/* save standard output to header file */
-{
-	hfname = mktemp(HFTEMPLATE);
-	if (freopen(hfname, "w", stdout) == NULL) {
-		sprintf(errmsg, "cannot open header file \"%s\"", hfname);
-		error(SYSTEM, errmsg);
-	}
-}
-
-
-closeheader()			/* done with header output */
-{
-	if (hfname == NULL)
-		return;
-	if (fflush(stdout) == EOF || (hfp = fopen(hfname, "r")) == NULL)
-		error(SYSTEM, "error reopening header file");
-}
-
-
-dupheader()			/* repeat header on standard output */
-{
-	register int  c;
-
-	if (fseek(hfp, 0L, 0) < 0)
-		error(SYSTEM, "seek error on header file");
-	while ((c = getc(hfp)) != EOF)
-		putchar(c);
-}
-
-
 rpict(seq, pout, zout, prvr)			/* generate image(s) */
 int  seq;
 char  *pout, *zout, *prvr;
@@ -180,13 +151,12 @@ char  *pout, *zout, *prvr;
  * sequenced file naming.
  */
 {
-	extern char  *rindex(), *strncpy(), *strcat();
+	extern char  *rindex(), *strncpy(), *strcat(), *strcpy();
 	char  fbuf[128], fbuf2[128];
+	int  npicts;
 	register char  *cp;
 	RESOLU	rs;
 	double	pa;
-					/* finished writing header */
-	closeheader();
 					/* check sampling */
 	if (psample < 1)
 		psample = 1;
@@ -210,13 +180,15 @@ char  *pout, *zout, *prvr;
 				error(USER, "unexpected EOF on view input");
 		prvr = fbuf;			/* mark for renaming */
 	}
-	if (pout != NULL) {
+	if (pout != NULL & prvr != NULL) {
 		sprintf(fbuf, pout, seq);
-		if (prvr != NULL && !strcmp(prvr, fbuf)) {	/* rename */
-			fbuf2[0] = '\0';
-			if ((cp = rindex(fbuf, '/')) != NULL)
-				strncpy(fbuf2, fbuf, cp-fbuf+1);
-			strcat(fbuf2, RFTEMPLATE);
+		if (!strcmp(prvr, fbuf)) {	/* rename */
+			strcpy(fbuf2, fbuf);
+			for (cp = fbuf2; *cp; cp++)
+				;
+			while (cp > fbuf2 && !ISDIRSEP(cp[-1]))
+				cp--;
+			strcpy(cp, RFTEMPLATE);
 			prvr = mktemp(fbuf2);
 			if (rename(fbuf, prvr) < 0 && errno != ENOENT) {
 				sprintf(errmsg,
@@ -226,17 +198,23 @@ char  *pout, *zout, *prvr;
 			}
 		}
 	}
-					/* render sequence */
+	npicts = 0;			/* render sequence */
 	do {
 		if (seq && nextview(stdin) == EOF)
 			break;
+		pctdone = 0.0;
 		if (pout != NULL) {
 			sprintf(fbuf, pout, seq);
+			if (prvr == NULL && access(fbuf, F_OK) == 0)
+				continue;		/* don't clobber */
 			if (freopen(fbuf, "w", stdout) == NULL) {
 				sprintf(errmsg,
 					"cannot open output file \"%s\"", fbuf);
 				error(SYSTEM, errmsg);
 			}
+#ifdef MSDOS
+			setmode(fileno(stdout), O_BINARY);
+#endif
 			dupheader();
 		}
 		hres = hresolu; vres = vresolu; pa = pixaspect;
@@ -276,7 +254,11 @@ char  *pout, *zout, *prvr;
 			cp = NULL;
 		render(cp, prvr);
 		prvr = NULL;
+		npicts++;
 	} while (seq++);
+					/* check that we did something */
+	if (npicts == 0)
+		error(WARNING, "no output produced");
 }
 
 
@@ -322,12 +304,15 @@ char  *zfile, *oldfile;
 			sampdens[i] = hstep;
 	} else
 		sampdens = NULL;
-					/* open z file */
+					/* open z-file */
 	if (zfile != NULL) {
 		if ((zfd = open(zfile, O_WRONLY|O_CREAT, 0666)) == -1) {
-			sprintf(errmsg, "cannot open z file \"%s\"", zfile);
+			sprintf(errmsg, "cannot open z-file \"%s\"", zfile);
 			error(SYSTEM, errmsg);
 		}
+#ifdef MSDOS
+		setmode(zfd, O_BINARY);
+#endif
 		for (i = 0; i <= psample; i++) {
 			zbar[i] = (float *)malloc(hres*sizeof(float));
 			if (zbar[i] == NULL)
@@ -344,14 +329,14 @@ char  *zfile, *oldfile;
 	i = salvage(oldfile);
 	if (zfd != -1 && i > 0 &&
 			lseek(zfd, (long)i*hres*sizeof(float), 0) == -1)
-		error(SYSTEM, "z file seek error in render");
+		error(SYSTEM, "z-file seek error in render");
 	pctdone = 100.0*i/vres;
 	if (ralrm > 0)			/* report init stats */
 		report();
 #ifndef	 BSD
 	else
 #endif
-	signal(SIGALRM, report);
+	signal(SIGCONT, report);
 	ypos = vres-1 - i;
 	fillscanline(scanbar[0], zbar[0], sampdens, hres, ypos, hstep);
 						/* compute scanlines */
@@ -374,7 +359,7 @@ char  *zfile, *oldfile;
 		fillscanbar(scanbar, zbar, hres, ypos, ystep);
 							/* write it out */
 #ifndef	 BSD
-		signal(SIGALRM, SIG_IGN);	/* don't interrupt writes */
+		signal(SIGCONT, SIG_IGN);	/* don't interrupt writes */
 #endif
 		for (i = ystep; i > 0; i--) {
 			if (zfd != -1 && write(zfd, (char *)zbar[i],
@@ -392,11 +377,11 @@ char  *zfile, *oldfile;
 			report();
 #ifndef	 BSD
 		else
-			signal(SIGALRM, report);
+			signal(SIGCONT, report);
 #endif
 	}
 						/* clean up */
-	signal(SIGALRM, SIG_IGN);
+	signal(SIGCONT, SIG_IGN);
 	if (zfd != -1) {
 		if (write(zfd, (char *)zbar[0], hres*sizeof(float))
 				< hres*sizeof(float))
@@ -416,6 +401,7 @@ char  *zfile, *oldfile;
 	pctdone = 100.0;
 	if (ralrm > 0)
 		report();
+	signal(SIGCONT, SIG_DFL);
 	return;
 writerr:
 	error(SYSTEM, "write error in render");
@@ -498,7 +484,6 @@ int  x, y;
 int  xlen, ylen;
 int  b;
 {
-	extern double  fabs();
 	double	ratio;
 	double	z;
 	COLOR  ctmp;
@@ -586,8 +571,11 @@ char  *oldfile;
 		error(WARNING, errmsg);
 		return(0);
 	}
+#ifdef MSDOS
+	setmode(fileno(fp), O_BINARY);
+#endif
 				/* discard header */
-	getheader(fp, NULL);
+	getheader(fp, NULL, NULL);
 				/* get picture size */
 	if (!fscnresolu(&x, &y, fp)) {
 		sprintf(errmsg, "bad recover file \"%s\"", oldfile);