--- ray/src/rt/rpict.c	1992/09/21 12:07:52	2.14
+++ ray/src/rt/rpict.c	1993/01/20 15:19:47	2.21
@@ -27,6 +27,8 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "paths.h"
 
+#define	 RFTEMPLATE	"rfXXXXXX"
+
 int  dimlist[MAXDIM];			/* sampling dimensions */
 int  ndims = 0;				/* number of sampling dimensions */
 int  samplendx;				/* sample index number */
@@ -45,7 +47,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 +65,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 */
 
@@ -78,12 +84,6 @@ extern long  nrays;			/* number of rays traced */
 
 #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 +96,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);
 }
 
@@ -135,36 +132,6 @@ report()		/* report progress */
 #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 +147,11 @@ char  *pout, *zout, *prvr;
  * sequenced file naming.
  */
 {
-	extern char  *rindex(), *strncpy(), *strcat();
+	extern char  *rindex(), *strncpy(), *strcat(), *strcpy();
 	char  fbuf[128], fbuf2[128];
 	register char  *cp;
 	RESOLU	rs;
 	double	pa;
-					/* finished writing header */
-	closeheader();
 					/* check sampling */
 	if (psample < 1)
 		psample = 1;
@@ -210,13 +175,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,
@@ -237,6 +204,9 @@ char  *pout, *zout, *prvr;
 					"cannot open output file \"%s\"", fbuf);
 				error(SYSTEM, errmsg);
 			}
+#ifdef MSDOS
+			setmode(fileno(stdout), O_BINARY);
+#endif
 			dupheader();
 		}
 		hres = hresolu; vres = vresolu; pa = pixaspect;
@@ -328,6 +298,9 @@ char  *zfile, *oldfile;
 			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)
@@ -498,7 +471,6 @@ int  x, y;
 int  xlen, ylen;
 int  b;
 {
-	extern double  fabs();
 	double	ratio;
 	double	z;
 	COLOR  ctmp;
@@ -586,8 +558,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);