--- ray/src/rt/ambient.c	1992/09/21 12:07:31	2.12
+++ ray/src/rt/ambient.c	1993/01/22 09:51:13	2.16
@@ -1,4 +1,4 @@
-/* Copyright (c) 1992 Regents of the University of California */
+/* Copyright (c) 1993 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -6,8 +6,6 @@ static char SCCSid[] = "$SunId$ LBL";
 
 /*
  *  ambient.c - routines dealing with ambient (inter-reflected) component.
- *
- *     5/9/86
  */
 
 #include  "ray.h"
@@ -37,7 +35,9 @@ double	minarad;		/* minimum ambient radius */
 
 static AMBTREE	atrunk;		/* our ambient trunk node */
 
+static char  *ambfname = NULL;	/* ambient file name */
 static FILE  *ambfp = NULL;	/* ambient file pointer */
+static int  nunflshed = 0;	/* number of unflushed ambient values */
 
 #define	 AMBFLUSH	(BUFSIZ/AMBVALSIZ)
 
@@ -46,7 +46,7 @@ static FILE  *ambfp = NULL;	/* ambient file pointer */
 #define	 newambtree()	(AMBTREE *)calloc(8, sizeof(AMBTREE))
 
 extern long  ftell(), lseek();
-static int  initambfile(), avsave(), avinsert(), ambsync();
+static int  initambfile(), avsave(), avinsert();
 
 
 setambres(ar)				/* set ambient resolution */
@@ -75,7 +75,7 @@ char  *afile;
 						/* init ambient limits */
 	setambres(ambres);
 						/* open ambient file */
-	if (afile != NULL)
+	if ((ambfname = afile) != NULL) {
 		if ((ambfp = fopen(afile, "r+")) != NULL) {
 			initambfile(0);
 			headlen = ftell(ambfp);
@@ -91,6 +91,9 @@ char  *afile;
 					afile);
 			error(SYSTEM, errmsg);
 		}
+		nunflshed++;	/* lie */
+		ambsync();
+	}
 }
 
 
@@ -167,7 +170,6 @@ AMBTREE	 *at;
 FVECT  c0;
 double	s;
 {
-	extern double  sqrt();
 	double	d, e1, e2, wt, wsum;
 	COLOR  ct;
 	FVECT  ck0;
@@ -323,12 +325,10 @@ int  creat;
 		fputformat(AMBFMT, ambfp);
 		putc('\n', ambfp);
 		putambmagic(ambfp);
-		fflush(ambfp);
-#ifndef	 NIX
-		sync();			/* protect against NFS buffering */
-#endif
-	} else if (checkheader(ambfp, AMBFMT, NULL) < 0 || !hasambmagic(ambfp))
-		error(USER, "bad ambient file");
+	} else if (checkheader(ambfp, AMBFMT, NULL) < 0 || !hasambmagic(ambfp)) {
+		sprintf(errmsg, "bad ambient file \"%s\"", ambfname);
+		error(USER, errmsg);
+	}
 }
 
 
@@ -336,21 +336,18 @@ static
 avsave(av)				/* insert and save an ambient value */
 AMBVAL	*av;
 {
-	static int  nunflshed = 0;
-
 	avinsert(av, &atrunk, thescene.cuorg, thescene.cusize);
 	if (ambfp == NULL)
 		return;
 	if (writambval(av, ambfp) < 0)
 		goto writerr;
-	if (++nunflshed >= AMBFLUSH) {
+	if (++nunflshed >= AMBFLUSH)
 		if (ambsync() == EOF)
 			goto writerr;
-		nunflshed = 0;
-	}
 	return;
 writerr:
-	error(SYSTEM, "error writing ambient file");
+	sprintf(errmsg, "error writing ambient file \"%s\"", ambfname);
+	error(SYSTEM, errmsg);
 }
 
 
@@ -393,27 +390,29 @@ memerr:
 
 #ifdef	NIX
 
-static
+int
 ambsync()			/* flush ambient file */
 {
+	if (nunflshed == 0)
+		return(0);
+	nunflshed = 0;
 	return(fflush(ambfp));
 }
 
 #else
 
-#include  <fcntl.h>
-#include  <sys/types.h>
-#include  <sys/stat.h>
-
-static
+int
 ambsync()			/* synchronize ambient file */
 {
 	static FILE  *ambinp = NULL;
+	static long  lastpos = -1;
 	struct flock  fls;
-	struct stat  sts;
+	long  flen;
 	AMBVAL	avs;
-	long  lastpos, flen;
 	register int  n;
+
+	if (nunflshed == 0)
+		return(0);
 				/* gain exclusive access */
 	fls.l_type = F_WRLCK;
 	fls.l_whence = 0;
@@ -421,24 +420,33 @@ ambsync()			/* synchronize ambient file */
 	fls.l_len = 0L;
 	if (fcntl(fileno(ambfp), F_SETLKW, &fls) < 0)
 		error(SYSTEM, "cannot lock ambient file");
+	if (lastpos < 0)	/* initializing */
+		goto syncend;
 				/* see if file has grown */
-	lastpos = lseek(fileno(ambfp), 0L, 1);	/* get previous position */
-	if (fstat(fileno(ambfp), &sts) < 0)	/* get current length */
-		error(SYSTEM, "cannot stat ambient file");
-	flen = sts.st_size;
-	if (n = (flen - lastpos)/AMBVALSIZ) {	/* file has grown */
-		if (ambinp == NULL)		/* use duplicate file */
-			ambinp = fdopen(dup(fileno(ambfp)), "r");
-		while (n--) {			/* load contributed values */
+	if ((flen = lseek(fileno(ambfp), 0L, 2)) < 0)
+		error(SYSTEM, "cannot seek on ambient file");
+	if (n = flen - lastpos) {		/* file has grown */
+		if (ambinp == NULL) {
+			ambinp = fopen(ambfname, "r");
+			if (ambinp == NULL)
+				error(SYSTEM, "fopen failed in ambsync");
+		}
+		if (fseek(ambinp, lastpos, 0) < 0)
+			error(SYSTEM, "fseek failed in ambsync");
+		while (n >= AMBVALSIZ) {	/* load contributed values */
 			readambval(&avs, ambinp);
 			avinsert(&avs,&atrunk,thescene.cuorg,thescene.cusize);
-		}				/* moves shared file pointer */
-		if (n = (flen - lastpos)%AMBVALSIZ)	/* alignment */
+			n -= AMBVALSIZ;
+		}
+		if (n)				/* alignment */
 			lseek(fileno(ambfp), flen-n, 0);
 	}
+syncend:
 	n = fflush(ambfp);			/* calls write() at last */
+	lastpos = lseek(fileno(ambfp), 0L, 1);
 	fls.l_type = F_UNLCK;			/* release file */
 	fcntl(fileno(ambfp), F_SETLKW, &fls);
+	nunflshed = 0;
 	return(n);
 }